From: Zoe Slattery <zoe@php.net>
Date: Sat, 6 Dec 2008 11:59:36 +0000 (+0000)
Subject: More changes to allow the same tests to be used with PHP5 and PHP6
X-Git-Tag: php-5.4.0alpha1~191^2~4878
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9eb13ad8ac059ebdb0e34311efa534e22fce2ba;p=php

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 99af7c2635..68e5c34f23 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',