From: Antony Dovgal <tony2001@php.net>
Date: Mon, 4 Dec 2006 17:48:27 +0000 (+0000)
Subject: fix tests, use -n to prevent any problems with existing php.ini
X-Git-Tag: RELEASE_1_0_0RC1~830
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f11c9c887133394234f57a88d013c171f11de131;p=php

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 d8dddf5730..937c8aa1ef 100644
--- 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 ffb72395d3..1e3b42cc19 100644
--- 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 3674af7fee..4a265255d8 100644
--- 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 e2f05bfa7f..85e2c743a1 100644
--- 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 d8021027be..db39887a1a 100644
--- 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 d0c82d35e5..372d1059d4 100644
--- 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 cd828fa99a..60fc389917 100644
--- 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 53e24859fc..8f049b70c4 100644
--- 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 60865df712..54f09342fe 100644
--- 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 eb406934a7..a2b5333858 100644
--- 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 b99319087e..d026757556 100644
--- 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 baa4478294..e1018644e6 100644
--- 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 6b2b39056d..dfd332b23a 100644
--- 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);