cvs: php-src / run-tests.php

andrei Fri Jul 14 23:04:33 2006 UTC Modified files: /php-src run-tests.php Log: Encode $wanted in output_encoding for comparison (workaround). http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.290&r2=1.291&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.290 php-src/run-tests.php:1.291 --- php-src/run-tests.php:1.290 Wed Jun 28 15:07:14 2006 +++ php-src/run-tests.php Fri Jul 14 23:04:32 2006 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.290 2006/06/28 15:07:14 tony2001 Exp $ */ +/* $Id: run-tests.php,v 1.291 2006/07/14 23:04:32 andrei 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 @@ -399,7 +399,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.290 $'."\n"; + echo '$Revision: 1.291 $'."\n"; exit(1); default: echo "Illegal switch specified!\n"; @@ -1517,6 +1517,8 @@ } } else { $wanted = trim($section_text['EXPECT']); + /* workaround until preg_replace() or str_replace() are upgraded */ + $wanted = unicode_encode($wanted, ini_get('unicode.output_encoding')); $wanted = preg_replace('/\r\n/',"\n",$wanted); // compare and leave on success if (!strcmp($output, $wanted)) {