From 9fe5094d77356e5c2e31196b49510b6fe604ca20 Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 25 Jul 2003 05:51:57 +0000
Subject: Fix run-test.php so it can correctly handle skip conditions.
---
run-tests.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'run-tests.php')
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 {
--
cgit v1.2.1