- Make -U mode play nicely with redirected tests

diff --git a/run-tests.php b/run-tests.php
index 2a4c2592f732d25b9eaf8c20456a2a1de5b9b71a..59b6d4c21a6ec16d760d2dcb4fc3f3148e15c234 100755 (executable)
--- 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) {