From 48013172bc0a1e124cbb7b9e7f4d4e8bd68b7058 Mon Sep 17 00:00:00 2001 From: Lars Strojny Date: Wed, 23 Jul 2008 16:11:00 +0000 Subject: [PATCH] Allowing "%unicode|string%" as a placeholder (backport from HEAD) --- run-tests.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/run-tests.php b/run-tests.php index ad73e0db25..2546d02855 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1711,6 +1711,11 @@ COMMAND $cmd if (isset($section_text['EXPECTF'])) { $wanted_re = preg_quote($wanted_re, '/'); + $wanted_re = str_replace( + array('%unicode\|string%', '%string\|unicode%'), + version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'unicode', + $wanted_re + ); // Stick to basics $wanted_re = str_replace('%e', '\\' . DIRECTORY_SEPARATOR, $wanted_re); $wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re); -- 2.50.1