MFH(r-1.168): fix run-test.php so it can correctly handle skip conditions.

diff --git a/run-tests.php b/run-tests.php
index da91aeb67fc8f9f348c6d80a2a0c9e81aec88f48..6b50e8df114e85c2f78cdb8e3c206c6054a9d503 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -608,11 +608,14 @@ TEST $file
        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 {