sniper Wed Dec 7 06:28:22 2005 EDT
Modified files:
/php-src run-tests.php
Log:
- Made tests that require CGI skipped if it is not available
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.251&r2=1.252&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.251 php-src/run-tests.php:1.252
--- php-src/run-tests.php:1.251 Wed Dec 7 06:11:01 2005
+++ php-src/run-tests.php Wed Dec 7 06:28:20 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.251 2005/12/07 11:11:01 sniper Exp $ */
+/* $Id: run-tests.php,v 1.252 2005/12/07 11:28:20 sniper Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -332,7 +332,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo "$Id: run-tests.php,v 1.251
2005/12/07 11:11:01 sniper Exp $\n";
+ echo "$Id: run-tests.php,v 1.252
2005/12/07 11:28:20 sniper Exp $\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -846,6 +846,7 @@
'TEST' => '',
'SKIPIF' => '',
'GET' => '',
+ 'POST' => '',
'ARGS' => '',
);
@@ -920,17 +921,20 @@
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)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
