diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-07-25 05:51:57 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-07-25 05:51:57 +0000 |
| commit | 9fe5094d77356e5c2e31196b49510b6fe604ca20 (patch) | |
| tree | d8edef253179e5ec6632aada960ff12a452fc63b /run-tests.php | |
| parent | ee3e4f79df1b767c441b241ad228a11be901c147 (diff) | |
| download | php-git-9fe5094d77356e5c2e31196b49510b6fe604ca20.tar.gz | |
Fix run-test.php so it can correctly handle skip conditions.
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/run-tests.php b/run-tests.php index a6a226f9ca..2ee70e4970 100755 --- a/run-tests.php +++ b/run-tests.php @@ -706,11 +706,13 @@ TEST $file if (array_key_exists('SKIPIF', $section_text)) { if (trim($section_text['SKIPIF'])) { save_text($tmp_skipif, $section_text['SKIPIF']); - $output = system_with_timeout("$php $info_params $tmp_skipif"); + $extra = substr(PHP_OS, 0, 3) !== "WIN" ? + "unset REQUEST_METHOD;": ""; + $output = system_with_timeout("$extra $php $info_params $tmp_skipif"); @unlink($tmp_skipif); if (eregi("^skip", trim($output))) { echo "SKIP $tested"; - $reason = (ereg("^skip[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^skip[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE; + $reason = (eregi("^skip[[:space:]]*(.+)\$", trim($output))) ? eregi_replace("^skip[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE; if ($reason) { echo " (reason: $reason)\n"; } else { |