From: Lars Strojny <lstrojny@php.net>
Date: Wed, 23 Jul 2008 16:11:00 +0000 (+0000)
Subject: Allowing "%unicode|string%" as a placeholder (backport from HEAD)
X-Git-Tag: php-5.3.0alpha1~182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48013172bc0a1e124cbb7b9e7f4d4e8bd68b7058;p=php

Allowing "%unicode|string%" as a placeholder (backport from HEAD)
---

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);