summaryrefslogtreecommitdiff
path: root/run-tests.php
diff options
context:
space:
mode:
authorFelix De Vliegher <felixdv@php.net>2008-08-29 10:25:35 +0000
committerFelix De Vliegher <felixdv@php.net>2008-08-29 10:25:35 +0000
commitf5234099cd7fdf1dc28232711ab9a04a73de9222 (patch)
treef86284189e6c96265ad107c68aec081882c8822d /run-tests.php
parenta61fe7d8d406a6754c91720d61e72bd677b81a4f (diff)
downloadphp-git-f5234099cd7fdf1dc28232711ab9a04a73de9222.tar.gz
Added %unicode_string_optional% for differences in output between PHP 5 and 6
Diffstat (limited to 'run-tests.php')
-rwxr-xr-xrun-tests.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php
index c5de430059..92e2180929 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1726,6 +1726,11 @@ COMMAND $cmd
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