jani Sat Apr 25 17:12:12 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src run-tests.php
Log:
MFH: Sync
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.62&r2=1.226.2.37.2.63&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.62
php-src/run-tests.php:1.226.2.37.2.63
--- php-src/run-tests.php:1.226.2.37.2.62 Sat Apr 25 16:54:50 2009
+++ php-src/run-tests.php Sat Apr 25 17:12:11 2009
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.62 2009/04/25 16:54:50 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.63 2009/04/25 17:12:11 jani 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
@@ -633,7 +633,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.62 $' .
"\n";
+ echo '$Revision: 1.226.2.37.2.63 $' .
"\n";
exit(1);
default:
@@ -1354,7 +1354,6 @@
if (is_array($IN_REDIRECT)) {
$tested = $IN_REDIRECT['prefix'] . ' ' .
trim($section_text['TEST']);
$tested_file = $tmp_relative_file;
- $section_text['FILE'] = "# original source file: $shortname\n"
. $section_text['FILE'];
}
// unlink old test results
@@ -1913,6 +1912,9 @@
// write .diff
$diff = generate_diff($wanted, $wanted_re, $output);
+ if (is_array($IN_REDIRECT)) {
+ $diff = "# original source file: $shortname\n" . $diff;
+ }
show_file_block('diff', $diff);
if (strpos($log_format, 'D') !== false &&
file_put_contents($diff_filename, (binary) $diff, FILE_BINARY) === false) {
error("Cannot create test diff - $diff_filename");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
