helly Fri Dec 23 19:40:13 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src run-tests.php
Log:
- MFH Fix handling of bork tests
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.19&r2=1.226.2.20&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.19 php-src/run-tests.php:1.226.2.20
--- php-src/run-tests.php:1.226.2.19 Wed Dec 21 22:23:55 2005
+++ php-src/run-tests.php Fri Dec 23 19:40:12 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.19 2005/12/21 22:23:55 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.20 2005/12/23 19:40:12 helly 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
@@ -365,7 +365,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.19 $'."\n";
+ echo '$Revision: 1.226.2.20 $'."\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -955,8 +955,11 @@
}
fclose($fp);
+ $shortname = str_replace($cwd.'/', '', $file);
+ $tested_file = $shortname;
+
if ($borked) {
- show_result("BORK", $bork_info);
+ show_result("BORK", $bork_info, $tested_file);
$PHP_FAILED_TESTS['BORKED'][] = array (
'name' => $file,
'test_name' =>
'',
@@ -967,9 +970,7 @@
return 'BORKED';
}
- $shortname = str_replace($cwd.'/', '', $file);
$tested = trim($section_text['TEST']);
- $tested_file = $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']))) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
