From e45dab8c49ab78bf77175be241076e8cd578b3e9 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 29 Jun 2007 09:49:21 +0000 Subject: [PATCH] Fixed CGI tests --- run-tests.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/run-tests.php b/run-tests.php index b9a22ffb35..647d337a1e 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1052,12 +1052,17 @@ TEST $file } elseif (!strncasecmp(PHP_OS, "win", 3) && file_exists(dirname($php) ."/php-cgi.exe")) { $old_php = $php; $php = realpath(dirname($php) ."/php-cgi.exe") .' -C '; - } elseif (file_exists("./sapi/cgi/php-cgi")) { - $old_php = $php; - $php = realpath("./sapi/cgi/php-cgi") . ' -C '; } else { - show_result("SKIP", $tested, $tested_file, "reason: CGI not available"); - return 'SKIPPED'; + if (file_exists(dirname($php)."/../../sapi/cgi/php-cgi")) { + $old_php = $php; + $php = realpath(dirname($php)."/../../sapi/cgi/php-cgi") . ' -C '; + } else if (file_exists("./sapi/cgi/php-cgi")) { + $old_php = $php; + $php = realpath("./sapi/cgi/php-cgi") . ' -C '; + } else { + show_result("SKIP", $tested, $tested_file, "reason: CGI not available"); + return 'SKIPPED'; + } } } -- 2.50.1