Fixed tests

diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt
index 64ce1f221fece7210807c4772fac601a77373bbe..e1b13e96603d6281af53691d2cc66492d605851c 100644 (file)
--- a/sapi/cli/tests/009.phpt
+++ b/sapi/cli/tests/009.phpt
@@ -7,9 +7,9 @@ using invalid combinations of cmdline options
 
 $php = getenv('TEST_PHP_EXECUTABLE');
 
-var_dump(`"$php" -n -c -r 'echo hello;'`);
-var_dump(`"$php" -n -a -r 'echo hello;'`);
-var_dump(`"$php" -n -r 'echo hello;' -a`);
+var_dump(`$php -n -c -r "echo hello;"`);
+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/011.phpt b/sapi/cli/tests/011.phpt
index 0d20d505b7ae5427fef662464669abfd20074fd3..6154693517a86f93f3f34393d6324f1b2afa2bb5 100644 (file)
--- a/sapi/cli/tests/011.phpt
+++ b/sapi/cli/tests/011.phpt
@@ -25,7 +25,7 @@ echo test::$var;
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -n -l "$filename"`);
+var_dump(`"$php" -n -l $filename`);
 var_dump(`"$php" -n -l some.unknown`);
 
 $code = '
@@ -40,7 +40,7 @@ class test
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -n -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 4cf91eb935a40b6ceeb4bda28e2f6e9900c5b61e..c1e4f6a63a51d56775a39a0c5cc8abcda31195d8 100644 (file)
--- a/sapi/cli/tests/012.phpt
+++ b/sapi/cli/tests/012.phpt
@@ -14,7 +14,7 @@ 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 ""`);
+var_dump(`"$php" -n -r '' -r ''`);
 
 echo "Done\n";
 ?>

diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt
index 81b9e4c0205cb98c834106feb4b1f884a6809e1a..e8c5203f67f84c96dd75df3e7b19657cb5043122 100644 (file)
--- a/sapi/cli/tests/014.phpt
+++ b/sapi/cli/tests/014.phpt
@@ -27,8 +27,8 @@ $o = new test;
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -n -s "$filename"`);
-var_dump(`"$php" -n -s "unknown"`);
+var_dump(`"$php" -n -s $filename`);
+var_dump(`"$php" -n -s unknown`);
 
 @unlink($filename);
 

diff --git a/sapi/cli/tests/015.phpt b/sapi/cli/tests/015.phpt
index ac407a6ef3a93595b89e1a7b880e2c0a31c9e293..be501d4713ad123c5b623022c6824a1e66f32807 100644 (file)
--- a/sapi/cli/tests/015.phpt
+++ b/sapi/cli/tests/015.phpt
@@ -1,7 +1,12 @@
 --TEST--
 CLI long options
 --SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php 
+include "skipif.inc"; 
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+       die ("skip not for Windows");
+}
+?>
 --FILE--
 <?php