From: Marcus Boerger <helly@php.net>
Date: Sat, 10 Dec 2005 17:37:29 +0000 (+0000)
Subject: - Make -U mode play nicely with redirected tests
X-Git-Tag: RELEASE_1_0_4~430
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd4842781c1d0c4c0d743e82ab1e8ca592be1443;p=php

- Make -U mode play nicely with redirected tests
---

diff --git a/run-tests.php b/run-tests.php
index 2a4c2592f7..59b6d4c21a 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1148,6 +1148,10 @@ TEST $file
 	//$ini_overwrites[] = 'setting=value';
 	settings2array($ini_overwrites, $ini_settings);
 
+	if ($unicode_and_native) {
+		$ini_settings["unicode_semantics"] = $unicode_semantics ? '1' : '0';
+	}
+
 	// Any special ini settings 
 	// these may overwrite the test defaults...
 	if (array_key_exists('INI', $section_text)) {
@@ -1161,7 +1165,7 @@ TEST $file
 			$unicode_test = TESTED_UNICODE;
 		}
 	} else {
-		$unicode_test = TESTED_UNICODE;
+		$unicode_test = $unicode_and_native ? $unicode_semantics : TESTED_UNICODE;
 	}
 
 	if ($unicode_test) {