From bfa084ddba6d6f61fddd57dd97beed1ecd1c555e Mon Sep 17 00:00:00 2001 From: foobar Date: Wed, 7 Dec 2005 11:28:58 +0000 Subject: [PATCH] MFH:- Made tests that require CGI skipped if it is not available --- run-tests.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/run-tests.php b/run-tests.php index 3678ff8121..b67d6dc177 100755 --- a/run-tests.php +++ b/run-tests.php @@ -814,6 +814,7 @@ TEST $file 'TEST' => '', 'SKIPIF' => '', 'GET' => '', + 'POST' => '', 'ARGS' => '', ); @@ -883,17 +884,20 @@ TEST $file return 'BORKED'; } + $shortname = str_replace($cwd.'/', '', $file); + $tested = trim($section_text['TEST'])." [$shortname]"; + /* For GET/POST tests, check if cgi sapi is available and if it is, use it. */ if ((!empty($section_text['GET']) || !empty($section_text['POST']))) { if (file_exists("./sapi/cgi/php")) { $old_php = $php; $php = realpath("./sapi/cgi/php") . ' -C '; + } else { + show_result("SKIP", $tested, $file, "reason: CGI not available"); + return 'SKIPPED'; } } - $shortname = str_replace($cwd.'/', '', $file); - $tested = trim($section_text['TEST'])." [$shortname]"; - show_test($test_idx, $shortname); if (is_array($IN_REDIRECT)) { -- 2.40.0