tony2001 Sun Jan 4 15:56:38 2009 UTC
Modified files:
/php-src run-tests.php
Log:
fix PDO and other 'redirected' tests - add that "# original source" line only
if the test fails
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.387&r2=1.388&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.387 php-src/run-tests.php:1.388
--- php-src/run-tests.php:1.387 Wed Dec 31 17:32:54 2008
+++ php-src/run-tests.php Sun Jan 4 15:56:38 2009
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.387 2008/12/31 17:32:54 zoe Exp $ */
+/* $Id: run-tests.php,v 1.388 2009/01/04 15:56:38 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.387 $' . "\n";
+ echo '$Revision: 1.388 $' . "\n";
exit(1);
default:
@@ -1338,7 +1338,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
@@ -1871,6 +1870,7 @@
// write .diff
$diff = generate_diff($wanted, $wanted_re, $output);
+ $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
