From b9eb13ad8ac059ebdb0e34311efa534e22fce2ba Mon Sep 17 00:00:00 2001 From: Zoe Slattery Date: Sat, 6 Dec 2008 11:59:36 +0000 Subject: [PATCH] More changes to allow the same tests to be used with PHP5 and PHP6 --- run-tests.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/run-tests.php b/run-tests.php index 99af7c2635f..68e5c34f237 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1734,6 +1734,11 @@ COMMAND $cmd if (isset($section_text['EXPECTF'])) { $wanted_re = preg_quote($wanted_re, '/'); + $wanted_re = str_replace( + array('%binary_string_optional%'), + version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'binary string', + $wanted_re + ); $wanted_re = str_replace( array('%unicode_string_optional%'), version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'Unicode string',