moriyoshi Fri Jul 25 01:51:57 2003 EDT Modified files: /php-src run-tests.php Log: Fix run-test.php so it can correctly handle skip conditions. Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.167 php-src/run-tests.php:1.168 --- php-src/run-tests.php:1.167 Thu Jul 24 13:44:16 2003 +++ php-src/run-tests.php Fri Jul 25 01:51:57 2003 @@ -706,11 +706,13 @@ 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 {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php