helly Tue Dec 6 19:01:53 2005 EDT
Modified files:
/php-src run-tests.php
Log:
- Show list of leaked files in summary if any
- Use basename correct
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.247&r2=1.248&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.247 php-src/run-tests.php:1.248
--- php-src/run-tests.php:1.247 Tue Dec 6 18:24:38 2005
+++ php-src/run-tests.php Tue Dec 6 19:01:51 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.247 2005/12/06 23:24:38 helly Exp $ */
+/* $Id: run-tests.php,v 1.248 2005/12/07 00:01:51 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
@@ -332,7 +332,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo "$Id: run-tests.php,v 1.247
2005/12/06 23:24:38 helly Exp $\n";
+ echo "$Id: run-tests.php,v 1.248
2005/12/07 00:01:51 helly Exp $\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -937,15 +937,15 @@
$tmp = realpath(dirname($file));
}
- $pu = $unicode_semantics ? '.u' : '';
+ $pu = $unicode_semantics ? 'u.' : '';
- $diff_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.diff', basename($file));
- $log_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.log', basename($file));
- $exp_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.exp', basename($file));
- $output_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.out', basename($file));
- $memcheck_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.mem', basename($file));
- $tmp_file = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.php', basename($file));
- $tmp_skipif = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.skip', basename($file));
+ $diff_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'diff';
+ $log_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'log';
+ $exp_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'exp';
+ $output_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'out';
+ $memcheck_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'mem';
+ $tmp_file = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'php';
+ $tmp_skipif = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'skip';
$tmp_post = $tmp . DIRECTORY_SEPARATOR . uniqid('/phpt.');
$tmp_relative_file = str_replace(dirname(__FILE__).DIRECTORY_SEPARATOR,
'', $tmp_file) . 't';
@@ -1555,6 +1555,18 @@
$failed_test_summary .=
"=====================================================================\n";
}
+ if (count($PHP_FAILED_TESTS['LEAKED'])) {
+ $failed_test_summary .= "
+=====================================================================
+LEAKED TEST SUMMARY
+---------------------------------------------------------------------
+";
+ foreach ($PHP_FAILED_TESTS['LEAKED'] as $failed_test_data) {
+ $failed_test_summary .= $failed_test_data['test_name']
. $failed_test_data['info'] . "\n";
+ }
+ $failed_test_summary .=
"=====================================================================\n";
+ }
+
if ($failed_test_summary && !getenv('NO_PHPTEST_SUMMARY')) {
$summary .= $failed_test_summary;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
