diff options
| author | Anatol Belski <ab@php.net> | 2015-09-30 09:16:02 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-09-30 11:13:28 +0200 |
| commit | e80306cbe89c75e3cbedf526134b3c4bcc1d6082 (patch) | |
| tree | 30c1efccb7ec4d1290d799d2a852dea413388e35 | |
| parent | 353d996c9f21da123d01bc26bda36766e0ce73b9 (diff) | |
| download | php-git-e80306cbe89c75e3cbedf526134b3c4bcc1d6082.tar.gz | |
fix tests on Windows
| -rw-r--r-- | sapi/cgi/tests/003.phpt | 5 | ||||
| -rw-r--r-- | sapi/cgi/tests/004.phpt | 6 | ||||
| -rw-r--r-- | sapi/cgi/tests/005.phpt | 9 | ||||
| -rw-r--r-- | sapi/cgi/tests/006.phpt | 6 |
4 files changed, 23 insertions, 3 deletions
diff --git a/sapi/cgi/tests/003.phpt b/sapi/cgi/tests/003.phpt index 533743323f..1ba94f27ef 100644 --- a/sapi/cgi/tests/003.phpt +++ b/sapi/cgi/tests/003.phpt @@ -2,6 +2,11 @@ strip comments and whitespace with -w --SKIPIF-- <?php + +if (substr(PHP_OS, 0, 3) == 'WIN') { + die ("skip not for Windows"); +} + include "skipif.inc"; ?> --FILE-- diff --git a/sapi/cgi/tests/004.phpt b/sapi/cgi/tests/004.phpt index 8769126561..0e7117080d 100644 --- a/sapi/cgi/tests/004.phpt +++ b/sapi/cgi/tests/004.phpt @@ -26,7 +26,11 @@ var_dump(test::$pri); file_put_contents($filename, $code); -var_dump(`$php -n -f "$filename" 2>/dev/null`); +if (defined("PHP_WINDOWS_VERSION_MAJOR")) { + var_dump(`$php -n -f "$filename"`); +} else { + var_dump(`$php -n -f "$filename" 2>/dev/null`); +} var_dump(`$php -n -f "wrong"`); @unlink($filename); diff --git a/sapi/cgi/tests/005.phpt b/sapi/cgi/tests/005.phpt index 34a28f9c5e..259005f3d9 100644 --- a/sapi/cgi/tests/005.phpt +++ b/sapi/cgi/tests/005.phpt @@ -1,7 +1,14 @@ --TEST-- using invalid combinations of cmdline options --SKIPIF-- -<?php include "skipif.inc"; ?> +<?php + +if (substr(PHP_OS, 0, 3) == 'WIN') { + die ("skip not for Windows"); +} + +include "skipif.inc"; +?> --FILE-- <?php diff --git a/sapi/cgi/tests/006.phpt b/sapi/cgi/tests/006.phpt index a2b2b2903a..08bfbf5d6c 100644 --- a/sapi/cgi/tests/006.phpt +++ b/sapi/cgi/tests/006.phpt @@ -44,7 +44,11 @@ class test file_put_contents($filename, $code); -var_dump(`"$php" -n -l "$filename" 2>/dev/null`); +if (defined("PHP_WINDOWS_VERSION_MAJOR")) { + var_dump(`"$php" -n -l "$filename"`); +} else { + var_dump(`"$php" -n -l "$filename" 2>/dev/null`); +} @unlink($filename); |