From 8f45f83124dde83ea6749b5996bce83d5e645b52 Mon Sep 17 00:00:00 2001 From: foobar Date: Wed, 7 Dec 2005 11:28:20 +0000 Subject: [PATCH] - Made tests that require CGI skipped if it is not available --- run-tests.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/run-tests.php b/run-tests.php index 4c6e3deb12..ef4c9ec117 100755 --- a/run-tests.php +++ b/run-tests.php @@ -846,6 +846,7 @@ TEST $file 'TEST' => '', 'SKIPIF' => '', 'GET' => '', + 'POST' => '', 'ARGS' => '', ); @@ -920,17 +921,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.50.1