- Made tests that require CGI skipped if it is not available

diff --git a/run-tests.php b/run-tests.php
index 4c6e3deb12479b498e4e2448fe67dfd854f339f6..ef4c9ec117ee868fa0d007d18b61a8f1ec191169 100755 (executable)
--- 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)) {