felixdv         Fri Aug 29 10:25:54 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src    run-tests.php 
  Log:
  Added %unicode_string_optional% for differences in output between PHP 5 and 6
  
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.43&r2=1.226.2.37.2.35.2.44&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.43 
php-src/run-tests.php:1.226.2.37.2.35.2.44
--- php-src/run-tests.php:1.226.2.37.2.35.2.43  Thu Aug 14 20:53:56 2008
+++ php-src/run-tests.php       Fri Aug 29 10:25:54 2008
@@ -24,7 +24,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.43 2008/08/14 20:53:56 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.44 2008/08/29 10:25:54 felixdv 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
@@ -608,7 +608,7 @@
                                        $html_output = is_resource($html_file);
                                        break;
                                case '--version':
-                                       echo '$Revision: 1.226.2.37.2.35.2.43 
$' . "\n";
+                                       echo '$Revision: 1.226.2.37.2.35.2.44 
$' . "\n";
                                        exit(1);
 
                                default:
@@ -1726,6 +1726,11 @@
                if (isset($section_text['EXPECTF'])) {
                        $wanted_re = preg_quote($wanted_re, '/');
                        $wanted_re = str_replace(
+                               array('%unicode_string_optional%'),
+                               version_compare(PHP_VERSION, '6.0.0-dev') == -1 
? 'string' : 'Unicode string',
+                               $wanted_re
+                       );
+                       $wanted_re = str_replace(
                                array('%unicode\|string%', '%string\|unicode%'),
                                version_compare(PHP_VERSION, '6.0.0-dev') == -1 
? 'string' : 'unicode',
                                $wanted_re



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to