nlopess Mon Jan 29 22:55:22 2007 UTC
Modified files:
/php-src run-tests.php
Log:
display all errors/leaks/warnings on each test, instead of showing just the
top most error
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.312&r2=1.313&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.312 php-src/run-tests.php:1.313
--- php-src/run-tests.php:1.312 Thu Dec 28 15:06:58 2006
+++ php-src/run-tests.php Mon Jan 29 22:55:22 2007
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.312 2006/12/28 15:06:58 nlopess Exp $ */
+/* $Id: run-tests.php,v 1.313 2007/01/29 22:55:22 nlopess 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
@@ -401,7 +401,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.312 $'."\n";
+ echo '$Revision: 1.313 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -1568,11 +1568,13 @@
}
if ($leaked) {
- $restype = 'LEAK';
- } else if ($warn) {
- $restype = 'WARN';
- } else {
- $restype = 'FAIL';
+ $restype[] = 'LEAK';
+ }
+ if ($warn) {
+ $restype[] = 'WARN';
+ }
+ if (!$passed) {
+ $restype[] = 'FAIL';
}
if (!$passed) {
@@ -1604,9 +1606,10 @@
}
}
- show_result($restype, $tested, $tested_file, $unicode_semantics, $info,
$temp_filenames);
+ show_result(implode('&', $restype), $tested, $tested_file,
$unicode_semantics, $info, $temp_filenames);
- $PHP_FAILED_TESTS[$restype.'ED'][] = array (
+ foreach ($restype as $type) {
+ $PHP_FAILED_TESTS[$type.'ED'][] = array (
'name' => $file,
'test_name' =>
(is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested . "
[$tested_file]",
'output' => $output_filename,
@@ -1614,12 +1617,13 @@
'info' => $info,
'unicode'=> $unicode_semantics,
);
+ }
if (isset($old_php)) {
$php = $old_php;
}
- return $restype.'ED';
+ return $restype[0].'ED';
}
function comp_line($l1,$l2,$is_reg)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
