fix tests, use -n to prevent any problems with existing php.ini

diff --git a/sapi/cli/tests/002-win32.phpt b/sapi/cli/tests/002-win32.phpt
index d8dddf5730448bd799d0e8f5cf07dd20623a960e..937c8aa1ef77ebba2be4c8f97139613d40052138 100644 (file)
--- a/sapi/cli/tests/002-win32.phpt
+++ b/sapi/cli/tests/002-win32.phpt
@@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 
 $php = $_ENV['TEST_PHP_EXECUTABLE'];
 
-var_dump(`"$php" -r "var_dump('hello');"`);
+var_dump(`"$php" -n -r "var_dump('hello');"`);
 
 echo "Done\n";
 ?>

diff --git a/sapi/cli/tests/002.phpt b/sapi/cli/tests/002.phpt
index ffb72395d3e8dbcac23b27328b808016bc41c2e2..1e3b42cc193f7dac01db1bba35ae67c8ec868626 100644 (file)
--- a/sapi/cli/tests/002.phpt
+++ b/sapi/cli/tests/002.phpt
@@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 $php = $_ENV['TEST_PHP_EXECUTABLE'];
 
-var_dump(`"$php" -r 'var_dump("hello");'`);
+var_dump(`"$php" -n -r 'var_dump("hello");'`);
 
 echo "Done\n";
 ?>

diff --git a/sapi/cli/tests/004.phpt b/sapi/cli/tests/004.phpt
index 3674af7fee639b72c849bdf8ae03bcfa8fe55a23..4a265255d81cd9c13492a961aa184925cc020889 100644 (file)
--- a/sapi/cli/tests/004.phpt
+++ b/sapi/cli/tests/004.phpt
@@ -7,9 +7,9 @@ show information about function
 
 $php = $_ENV['TEST_PHP_EXECUTABLE'];
 
-var_dump(`"$php" --rf unknown`);
-var_dump(`"$php" --rf echo`);
-var_dump(`"$php" --rf phpinfo`);
+var_dump(`"$php" -n --rf unknown`);
+var_dump(`"$php" -n --rf echo`);
+var_dump(`"$php" -n --rf phpinfo`);
 
 echo "Done\n";
 ?>

diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt
index e2f05bfa7f25e441ae77abc73f81c471a2750331..85e2c743a169e1432293a81c048eb6baa609d718 100644 (file)
--- a/sapi/cli/tests/005.phpt
+++ b/sapi/cli/tests/005.phpt
@@ -7,9 +7,9 @@ show information about class
 
 $php = $_ENV['TEST_PHP_EXECUTABLE'];
 
-var_dump(`"$php" --rc unknown`);
-var_dump(`"$php" --rc stdclass`);
-var_dump(`"$php" --rc exception`);
+var_dump(`"$php" -n --rc unknown`);
+var_dump(`"$php" -n --rc stdclass`);
+var_dump(`"$php" -n --rc exception`);
 
 echo "Done\n";
 ?>

diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index d8021027be9936f11b1852fc4153bdd3f9c03dee..db39887a1ae7b6504f8d60ea92a7f8be138440c2 100644 (file)
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -7,8 +7,8 @@ show information about extension
 
 $php = $_ENV['TEST_PHP_EXECUTABLE'];
 
-var_dump(`"$php" --re unknown`);
-var_dump(`"$php" --re ""`);
+var_dump(`"$php" -n --re unknown`);
+var_dump(`"$php" -n --re ""`);
 var_dump(`"$php" -n --re date`);
 
 echo "Done\n";

diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt
index d0c82d35e58b26ee88511ff96527558d000870cf..372d1059d4865df5365f683558d5a270c24ad7b6 100644 (file)
--- a/sapi/cli/tests/007.phpt
+++ b/sapi/cli/tests/007.phpt
@@ -32,9 +32,9 @@ class test { /* {{{ */
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -w "$filename"`);
-var_dump(`"$php" -w "wrong"`);
-var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() {} } ?>" | $php -w`);
+var_dump(`"$php" -n -w "$filename"`);
+var_dump(`"$php" -n -w "wrong"`);
+var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() {} } ?>" | $php -n -w`);
 
 @unlink($filename);
 

diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt
index cd828fa99acca1aa33ac8c50aff7cc19f834e89c..60fc3899171cca978446f529d54e8a58a7e8153d 100644 (file)
--- a/sapi/cli/tests/008.phpt
+++ b/sapi/cli/tests/008.phpt
@@ -26,8 +26,8 @@ var_dump(test::$pri);
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -f "$filename"`);
-var_dump(`"$php" -f "wrong"`);
+var_dump(`"$php" -n -f "$filename"`);
+var_dump(`"$php" -n -f "wrong"`);
 
 @unlink($filename);
 

diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt
index 53e24859fceee627e76bf6f43880fa4fa5aee0ad..8f049b70c45545c6943b81898ec49d21bec94490 100644 (file)
--- a/sapi/cli/tests/009.phpt
+++ b/sapi/cli/tests/009.phpt
@@ -8,8 +8,8 @@ using invalid combinations of cmdline options
 $php = $_ENV['TEST_PHP_EXECUTABLE'];
 
 var_dump(`"$php" -n -c -r 'echo hello;'`);
-var_dump(`"$php" -a -r 'echo hello;'`);
-var_dump(`"$php" -r 'echo hello;' -a`);
+var_dump(`"$php" -n -a -r 'echo hello;'`);
+var_dump(`"$php" -n -r 'echo hello;' -a`);
 
 echo "Done\n";
 ?>

diff --git a/sapi/cli/tests/010-2.phpt b/sapi/cli/tests/010-2.phpt
index 60865df712e6309e63486befd581a8bbe4dfaa2e..54f09342fe7bf08a876aca24602031c2bcb72289 100644 (file)
--- a/sapi/cli/tests/010-2.phpt
+++ b/sapi/cli/tests/010-2.phpt
@@ -21,7 +21,7 @@ hello
 
 file_put_contents($filename_txt, $txt);
 
-var_dump(`cat "$filename_txt" | "$php" -R "var_dump(1);"`);
+var_dump(`cat "$filename_txt" | "$php" -n -R "var_dump(1);"`);
 
 @unlink($filename_txt);
 

diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt
index eb406934a709660b3ddbdd46add0a6f4cb3024ff..a2b5333858d800494f3c7851f31e4fc1c12343c1 100644 (file)
--- a/sapi/cli/tests/010.phpt
+++ b/sapi/cli/tests/010.phpt
@@ -30,7 +30,7 @@ hello
 
 file_put_contents($filename_txt, $txt);
 
-var_dump(`cat "$filename_txt" | "$php" -F "$filename"`);
+var_dump(`cat "$filename_txt" | "$php" -n -F "$filename"`);
 
 @unlink($filename);
 @unlink($filename_txt);

diff --git a/sapi/cli/tests/011.phpt b/sapi/cli/tests/011.phpt
index b99319087e7b9ea93872c22a911aaad2e946c78b..d0267575561b92380022f89b45cd3e014df380d0 100644 (file)
--- a/sapi/cli/tests/011.phpt
+++ b/sapi/cli/tests/011.phpt
@@ -25,8 +25,8 @@ echo test::$var;
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -l "$filename"`);
-var_dump(`"$php" -l some.unknown`);
+var_dump(`"$php" -n -l "$filename"`);
+var_dump(`"$php" -n -l some.unknown`);
 
 $code = '
 <?php
@@ -40,7 +40,7 @@ class test
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -l "$filename"`);
+var_dump(`"$php" -n -l "$filename"`);
 
 @unlink($filename);
 

diff --git a/sapi/cli/tests/012.phpt b/sapi/cli/tests/012.phpt
index baa44782947a0c6e9496e7e93edef4a27a2c8999..e1018644e6b7bba8d007f5253352de24d78c04b8 100644 (file)
--- a/sapi/cli/tests/012.phpt
+++ b/sapi/cli/tests/012.phpt
@@ -7,14 +7,14 @@ invalid arguments and error messages
 
 $php = $_ENV['TEST_PHP_EXECUTABLE'];
 
-var_dump(`"$php" -F some.php -F some.php`);
-var_dump(`"$php" -F some.php -R some.php`);
-var_dump(`"$php" -R some.php -F some.php`);
-var_dump(`"$php" -R some.php -R some.php`);
-var_dump(`"$php" -f some.php -f some.php`);
-var_dump(`"$php" -B '' -B ''`);
-var_dump(`"$php" -E '' -E ''`);
-var_dump(`"$php" -r "" -r ""`);
+var_dump(`"$php" -n -F some.php -F some.php`);
+var_dump(`"$php" -n -F some.php -R some.php`);
+var_dump(`"$php" -n -R some.php -F some.php`);
+var_dump(`"$php" -n -R some.php -R some.php`);
+var_dump(`"$php" -n -f some.php -f some.php`);
+var_dump(`"$php" -n -B '' -B ''`);
+var_dump(`"$php" -n -E '' -E ''`);
+var_dump(`"$php" -n -r "" -r ""`);
 
 echo "Done\n";
 ?>

diff --git a/sapi/cli/tests/013.phpt b/sapi/cli/tests/013.phpt
index 6b2b39056d7513766a3229c65553cf596beb0ba9..dfd332b23ab56477405e07734bcb19d626c0a4a5 100644 (file)
--- a/sapi/cli/tests/013.phpt
+++ b/sapi/cli/tests/013.phpt
@@ -15,9 +15,9 @@ $php = $_ENV['TEST_PHP_EXECUTABLE'];
 $filename_txt = dirname(__FILE__)."/013.test.txt";
 file_put_contents($filename_txt, "test\nfile\ncontents\n");
 
-var_dump(`cat "$filename_txt" | "$php" -B 'var_dump("start");'`);
-var_dump(`cat "$filename_txt" | "$php" -E 'var_dump("end");'`);
-var_dump(`cat "$filename_txt" | "$php" -B 'var_dump("start");' -E 'var_dump("end");'`);
+var_dump(`cat "$filename_txt" | "$php" -n -B 'var_dump("start");'`);
+var_dump(`cat "$filename_txt" | "$php" -n -E 'var_dump("end");'`);
+var_dump(`cat "$filename_txt" | "$php" -n -B 'var_dump("start");' -E 'var_dump("end");'`);
 
 @unlink($filename_txt);