More changes to allow the same tests to be used with PHP5 and PHP6

diff --git a/run-tests.php b/run-tests.php
index 67b40719361b5cc40fae2638a95c426371a84d6b..8bd8926d697351cf9db6ac2575475c9915fb6612 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -1729,6 +1729,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',