helly Sat Mar 11 18:13:37 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src run-tests.php
Log:
- MFH Fix writing faillog with redirected tests
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.34&r2=1.226.2.35&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.34 php-src/run-tests.php:1.226.2.35
--- php-src/run-tests.php:1.226.2.34 Sat Mar 11 17:58:24 2006
+++ php-src/run-tests.php Sat Mar 11 18:13:37 2006
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.34 2006/03/11 17:58:24 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.35 2006/03/11 18:13:37 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
@@ -388,7 +388,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.34 $'."\n";
+ echo '$Revision: 1.226.2.35 $'."\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -878,10 +878,21 @@
foreach($test_files as $name)
{
- if ($redir_tested) {
+ if (is_array($name))
+ {
+ $index = "# $name[1]: $name[0]";
+ if ($redir_tested)
+ {
+ $name = $name[0];
+ }
+ }
+ else if ($redir_tested)
+ {
$index = "# $redir_tested: $name";
- } else {
- $index = is_array($name) ? "# $name[1]: $name[0]" :
$name;
+ }
+ else
+ {
+ $index = $name;
}
$test_idx++;
$result = run_test($php, $name, $env);
@@ -1186,7 +1197,9 @@
} else {
$GLOBALS['test_files'] = $test_files;
find_files($IN_REDIRECT['TESTS']);
- $test_files = $GLOBALS['test_files'];
+ foreach($GLOBALS['test_files'] as $f) {
+ $test_files[] = array($f, $file);
+ }
}
$test_cnt += count($test_files) - 1;
$test_idx--;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
