- Add ability to execute .php generated from .phpt on failure without the

  need to manually set the environment.

diff --git a/ext/pdo/tests/pdo_001.phpt b/ext/pdo/tests/pdo_001.phpt
index e90d8ff16278f617d70a0a706d01c3fb5fa822ec..0c03d016de6cba51dd5dcd2e6346ba98877f32eb 100644 (file)
--- a/ext/pdo/tests/pdo_001.phpt
+++ b/ext/pdo/tests/pdo_001.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_002.phpt b/ext/pdo/tests/pdo_002.phpt
index 4c4363ba4a12d246f97417106720dfb67d4ab041..b83a874e29182e3ba542c7b26bdcbd69b867b417 100644 (file)
--- a/ext/pdo/tests/pdo_002.phpt
+++ b/ext/pdo/tests/pdo_002.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_003.phpt b/ext/pdo/tests/pdo_003.phpt
index b4d86dece1d50f2ac82ac58e3648890b03a6fe77..81e314b56fcf0023a2a804d717cd918cb7d9a02d 100644 (file)
--- a/ext/pdo/tests/pdo_003.phpt
+++ b/ext/pdo/tests/pdo_003.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_004.phpt b/ext/pdo/tests/pdo_004.phpt
index ab5af41e82d279a7f5b913fce76ca5a295efc6c4..e8e4f43480c18c9d89530ad22b89e1fd853d40d9 100644 (file)
--- a/ext/pdo/tests/pdo_004.phpt
+++ b/ext/pdo/tests/pdo_004.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt
index 3c107a0fa004a295932f111347c3ca41d837adbf..2f641dcd01fe9f92086a70e48e54c7eac7068daa 100644 (file)
--- a/ext/pdo/tests/pdo_005.phpt
+++ b/ext/pdo/tests/pdo_005.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_006.phpt b/ext/pdo/tests/pdo_006.phpt
index c8b92a5a8f61e8bdff36c74a8e3ab30db04cad5c..4c1f61b935ad7755fad5bd7d0209d22edcd87b85 100644 (file)
--- a/ext/pdo/tests/pdo_006.phpt
+++ b/ext/pdo/tests/pdo_006.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_007.phpt b/ext/pdo/tests/pdo_007.phpt
index 89794a1d8964e00d28d2fbe1468f649d5bbe37f0..97dcf310f5df8e45d72d43558a92f5200da5497a 100644 (file)
--- a/ext/pdo/tests/pdo_007.phpt
+++ b/ext/pdo/tests/pdo_007.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_008.phpt b/ext/pdo/tests/pdo_008.phpt
index 628904db2ff4db9753081dcb0a6bd87678ddb8d4..680087855b52730df33bdfee31f9c563879d7e4f 100644 (file)
--- a/ext/pdo/tests/pdo_008.phpt
+++ b/ext/pdo/tests/pdo_008.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt
index 48d9b57396972cd05ea09851af6c97a70aa37238..458497a649e578fe57e6662466c5a0f13c15dc48 100644 (file)
--- a/ext/pdo/tests/pdo_009.phpt
+++ b/ext/pdo/tests/pdo_009.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt
index 8b51238ab4490f108df85517b8de119326e62a55..7d886bbeeacce93db082df3caf1e5e87d53ed2fb 100644 (file)
--- a/ext/pdo/tests/pdo_010.phpt
+++ b/ext/pdo/tests/pdo_010.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
index 40e478455be75c4fc003fd6588347fe0e400050d..87d99b0956e98eb3236bb1298c1887951628a5d6 100644 (file)
--- a/ext/pdo/tests/pdo_011.phpt
+++ b/ext/pdo/tests/pdo_011.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
index fe904dc146e7ac895b77874d22030201578ed54e..a344afaf7360196794504bc1b1f26d73d6dc3450 100644 (file)
--- a/ext/pdo/tests/pdo_012.phpt
+++ b/ext/pdo/tests/pdo_012.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
index 6ce1fa0e1360b1b42e8d80d55a8e368bd6ffa8dd..28ac0dc1f710a0cc73ddea51350f8a3ab8d328f4 100644 (file)
--- a/ext/pdo/tests/pdo_013.phpt
+++ b/ext/pdo/tests/pdo_013.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt
index 2f18366f48b0ca1c5ec297bc083bea89c0630b98..9dbe68e06d21e568e5dfe26c0393ab288548058c 100644 (file)
--- a/ext/pdo/tests/pdo_014.phpt
+++ b/ext/pdo/tests/pdo_014.phpt
@@ -12,6 +12,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt
index 6e90fdcb976e0eb7ba4f09797cc1f21c0358219c..089b814adcbeb2f0d70815bf95e3c359781ebcb0 100644 (file)
--- a/ext/pdo/tests/pdo_015.phpt
+++ b/ext/pdo/tests/pdo_015.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index fa6715f06bce29edddfaff6d2f01c91ffcb6a74e..30346c79325e6f8ac5edb8c84b9d2a6680b704b3 100644 (file)
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt
index 2ec1f2290327000ac5e9eb81b87d58a4012e522a..964dd08e0e978309e7a06f4de4c146d59e279682 100755 (executable)
--- a/ext/pdo/tests/pdo_016a.phpt
+++ b/ext/pdo/tests/pdo_016a.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_017.phpt b/ext/pdo/tests/pdo_017.phpt
index bb35bd8aca6b574f77b8e6921dc653b32c52390a..5594ae9787e6ee68f303a2a03129a949ae8a05ea 100644 (file)
--- a/ext/pdo/tests/pdo_017.phpt
+++ b/ext/pdo/tests/pdo_017.phpt
@@ -23,6 +23,7 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
index 1c57852a26f53fe38bc9b0889d90adca59167c80..3264893a4380b9116202804e2875f62e72bc299f 100644 (file)
--- a/ext/pdo/tests/pdo_018.phpt
+++ b/ext/pdo/tests/pdo_018.phpt
@@ -11,6 +11,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt
index 8ca3b67f0e2ba88a05604591ab3ac5e90a07ae23..383234df10716442182e8777636564ac5148c84e 100644 (file)
--- a/ext/pdo/tests/pdo_019.phpt
+++ b/ext/pdo/tests/pdo_019.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_020.phpt b/ext/pdo/tests/pdo_020.phpt
index 5e6c68fcc8569901350b1c5af9fb6ae50f2a7da0..a4396e6e2f76de01ba2456519fe408c920a5eb49 100644 (file)
--- a/ext/pdo/tests/pdo_020.phpt
+++ b/ext/pdo/tests/pdo_020.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_021.phpt b/ext/pdo/tests/pdo_021.phpt
index c1688c092b58ba8b48273d22a58cd8c66acf75a2..172800028669488ed0ebd33a786f126dc804ecaf 100644 (file)
--- a/ext/pdo/tests/pdo_021.phpt
+++ b/ext/pdo/tests/pdo_021.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_022.phpt b/ext/pdo/tests/pdo_022.phpt
index 4a97f0b7f8707345e3b8ebe33432a11b5f976c89..12f79fef60fc9e03e712a302a472274b9a8ef4e1 100644 (file)
--- a/ext/pdo/tests/pdo_022.phpt
+++ b/ext/pdo/tests/pdo_022.phpt
@@ -20,6 +20,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt
index 996fa7c6456033573dd0e019881e85b4c9b0a13a..25940f5f4cd1e05f8e2357692022ded4002123a3 100644 (file)
--- a/ext/pdo/tests/pdo_023.phpt
+++ b/ext/pdo/tests/pdo_023.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 class PDOStatementX extends PDOStatement

diff --git a/ext/pdo/tests/pdo_024.phpt b/ext/pdo/tests/pdo_024.phpt
index e16303370db4e27eb88477a645e6949244b7a9da..a910996c2f1ec06c0338ebe4baf7c16d70c196b6 100644 (file)
--- a/ext/pdo/tests/pdo_024.phpt
+++ b/ext/pdo/tests/pdo_024.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt
index d65c93356dbb62316940054f308544fa904f3e60..2f51bd2f89c78a8f64e883534114502ae1ee95d4 100644 (file)
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt
index f61f16894ee4122c89cf176b699a08c2f292865c..c7d5debd02bd4f9c1f66d30b84ed5b246d040438 100644 (file)
--- a/ext/pdo/tests/pdo_026.phpt
+++ b/ext/pdo/tests/pdo_026.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 $data = array(

diff --git a/ext/pdo/tests/pdo_027.phpt b/ext/pdo/tests/pdo_027.phpt
index 226b4670aa932312f3d54ee61a6c378c29ca2496..492b6e0fcdf44bd59dbe0cce1c7a2711fc657da3 100644 (file)
--- a/ext/pdo/tests/pdo_027.phpt
+++ b/ext/pdo/tests/pdo_027.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_028.phpt b/ext/pdo/tests/pdo_028.phpt
index aaf0f56c41a123729dcc3627c690b97ff8bb8373..7d04dd96edb51bbe12cf1905677bdbee9837de24 100644 (file)
--- a/ext/pdo/tests/pdo_028.phpt
+++ b/ext/pdo/tests/pdo_028.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 

diff --git a/ext/pdo/tests/pdo_test.inc b/ext/pdo/tests/pdo_test.inc
index 79df2baa29c8f949151d490fa3c26167436da2f3..94fa9fbbfaa51a18944ee80a3a1e0071cd1b26dc 100644 (file)
--- a/ext/pdo/tests/pdo_test.inc
+++ b/ext/pdo/tests/pdo_test.inc
@@ -1,6 +1,21 @@
 <?php
 # PDO test framework utilities
 
+if (getenv('PDOTEST_DSN') === false) {
+       $common = '';
+       $append = false;
+       foreach(file(dirname($_SERVER['PHP_SELF']).'/common.phpt') as $line) {
+               if ($append) {
+                       $common .= $line;
+               } elseif (trim($line) == '--REDIRECTTEST--') {
+                       $append = true;
+               }
+       }
+       if (ini_get('magic_quotes_runtime')) $common = stripslashes($common);
+       $conf = eval($common);
+       foreach($conf['ENV'] as $n=>$v) putenv("$n=$v");
+}
+
 class PDOTest {
        // create an instance of the PDO driver, based on
        // the current environment

diff --git a/ext/pdo/tests/pecl_bug_5217.phpt b/ext/pdo/tests/pecl_bug_5217.phpt
index 75df91956f686b70ba65b53542aec3273cdc1186..4b1170645ebd93fbf80c2411263ebf6d68685549 100644 (file)
--- a/ext/pdo/tests/pecl_bug_5217.phpt
+++ b/ext/pdo/tests/pecl_bug_5217.phpt
@@ -10,6 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 try {