cvs: php-src(PHP_4_3) / run-tests.php
| From: | Moriyoshi Koizumi | Date: | Fri, 25 Jul 2003 05:52:26 +0000 |
| Subject: | cvs: php-src(PHP_4_3) / run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-22798@lists.php.net to get a copy of this message | ||
moriyoshi Fri Jul 25 01:52:26 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src run-tests.php
Log:
MFH(r-1.168): 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.119.2.33 php-src/run-tests.php:1.119.2.34
--- php-src/run-tests.php:1.119.2.33 Thu Jul 24 13:45:15 2003
+++ php-src/run-tests.php Fri Jul 25 01:52:26 2003
@@ -608,11 +608,14 @@
if (array_key_exists('SKIPIF', $section_text)) {
if (trim($section_text['SKIPIF'])) {
save_text($tmp_skipif, $section_text['SKIPIF']);
- $output =
$php $info_params $tmp_skipif;
+ $extra = substr(PHP_OS, 0, 3) !== "WIN" ?
+ "unset REQUEST_METHOD;": "";
+
+ $output = $extra $php $info_params -f $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 {