So now this is out-of-sync in all branches. Please, one version only..
Advertising
--Jani
Antony Dovgal wrote:
tony2001 Mon Jan 5 09:18:57 2009 UTC
Modified files:
/php-src run-tests.php
Log:
only add "# original source" if a redirect is active
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.388&r2=1.389&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.388 php-src/run-tests.php:1.389
--- php-src/run-tests.php:1.388 Sun Jan 4 15:56:38 2009
+++ php-src/run-tests.php Mon Jan 5 09:18:57 2009
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.388 2009/01/04 15:56:38 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.389 2009/01/05 09:18:57 tony2001 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.388 $' . "\n";
+ echo '$Revision: 1.389 $' . "\n";
exit(1);
default:
@@ -1870,7 +1870,9 @@
// write .diff
$diff = generate_diff($wanted, $wanted_re, $output);
- $diff = "# original source file: $shortname\n" . $diff;
+ 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
