From e411cf8269b1c8b1334500ebd80e5348fc0b0c8c Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 12 Mar 2014 19:29:56 +0100
Subject: [PATCH] php: remove the custom "env" loading in tests

Other than being too late for changing environment variables like
LD_LIBRARY_PATH, now it is no more needed.
---
 php/extension/guestfs_php_001.phpt | 14 --------------
 php/extension/guestfs_php_002.phpt | 14 --------------
 php/extension/guestfs_php_003.phpt | 14 --------------
 3 files changed, 42 deletions(-)

diff --git a/php/extension/guestfs_php_001.phpt b/php/extension/guestfs_php_001.phpt
index 65723a6f4..013ebb577 100644
--- a/php/extension/guestfs_php_001.phpt
+++ b/php/extension/guestfs_php_001.phpt
@@ -2,20 +2,6 @@
 Load the module and create a handle.
 --FILE--
 <?php
-
-// See comment in php/run-php-tests.sh.
-//putenv ('LIBGUESTFS_DEBUG=1');
-if (! $fp = fopen ("env", "r")) {
-  die ("Error: cannot open environment file 'env'\n");
-}
-while (($buffer = fgets ($fp)) != false) {
-  putenv (chop ($buffer, "\n"));
-}
-if (!feof ($fp)) {
-  die ("Error: unexpected failure of fgets\n");
-}
-fclose ($fp);
-
 $g = guestfs_create ();
 if ($g == false) {
   echo ("Failed to create guestfs_php handle.\n");
diff --git a/php/extension/guestfs_php_002.phpt b/php/extension/guestfs_php_002.phpt
index e4d3faf60..91b20678a 100644
--- a/php/extension/guestfs_php_002.phpt
+++ b/php/extension/guestfs_php_002.phpt
@@ -2,20 +2,6 @@
 Launch the appliance and run basic tests.
 --FILE--
 <?php
-
-// See comment in php/run-php-tests.sh.
-//putenv ('LIBGUESTFS_DEBUG=1');
-if (! $fp = fopen ("env", "r")) {
-  die ("Error: cannot open environment file 'env'\n");
-}
-while (($buffer = fgets ($fp)) != false) {
-  putenv (chop ($buffer, "\n"));
-}
-if (!feof ($fp)) {
-  die ("Error: unexpected failure of fgets\n");
-}
-fclose ($fp);
-
 $g = guestfs_create ();
 if ($g == false) {
   echo ("Failed to create guestfs_php handle.\n");
diff --git a/php/extension/guestfs_php_003.phpt b/php/extension/guestfs_php_003.phpt
index 8cb78dad6..e268e98ce 100644
--- a/php/extension/guestfs_php_003.phpt
+++ b/php/extension/guestfs_php_003.phpt
@@ -2,20 +2,6 @@
 Check function with optional arguments.
 --FILE--
 <?php
-
-// See comment in php/run-php-tests.sh.
-//putenv ('LIBGUESTFS_DEBUG=1');
-if (! $fp = fopen ("env", "r")) {
-  die ("Error: cannot open environment file 'env'\n");
-}
-while (($buffer = fgets ($fp)) != false) {
-  putenv (chop ($buffer, "\n"));
-}
-if (!feof ($fp)) {
-  die ("Error: unexpected failure of fgets\n");
-}
-fclose ($fp);
-
 $g = guestfs_create ();
 if ($g == false) {
   echo ("Failed to create guestfs_php handle.\n");