Skip unicode tests in non-unicode mode

19 files changed, 38 insertions, 23 deletions

diff --git a/tests/unicode/autodetect-SCSU.phpt b/tests/unicode/autodetect-SCSU.phpt
index 12213a81bd..64d6601924 100755
--- a/tests/unicode/autodetect-SCSU.phpt
+++ b/tests/unicode/autodetect-SCSU.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding autodetection (SCSU)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF16BE.phpt b/tests/unicode/autodetect-UTF16BE.phpt
index f7a1d6bd3e..678b2332ca 100755
--- a/tests/unicode/autodetect-UTF16BE.phpt
+++ b/tests/unicode/autodetect-UTF16BE.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding autodetection (UTF-16BE)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF16LE.phpt b/tests/unicode/autodetect-UTF16LE.phpt
index 4302029fee..9c219f9119 100755
--- a/tests/unicode/autodetect-UTF16LE.phpt
+++ b/tests/unicode/autodetect-UTF16LE.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding autodetection (UTF-16LE)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF32BE.phpt b/tests/unicode/autodetect-UTF32BE.phpt
index 9378583f86..2b0c5b5273 100755
--- a/tests/unicode/autodetect-UTF32BE.phpt
+++ b/tests/unicode/autodetect-UTF32BE.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding autodetection (UTF-32BE)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF32LE.phpt b/tests/unicode/autodetect-UTF32LE.phpt
index a05711dfaa..f1041c8dce 100755
--- a/tests/unicode/autodetect-UTF32LE.phpt
+++ b/tests/unicode/autodetect-UTF32LE.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding autodetection (UTF-32LE)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF7.phpt b/tests/unicode/autodetect-UTF7.phpt
index 26ba3966dd..d9a33a47d7 100755
--- a/tests/unicode/autodetect-UTF7.phpt
+++ b/tests/unicode/autodetect-UTF7.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding autodetection (UTF7)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF8.phpt b/tests/unicode/autodetect-UTF8.phpt
index 29b561e9fb..2f91be3497 100755
--- a/tests/unicode/autodetect-UTF8.phpt
+++ b/tests/unicode/autodetect-UTF8.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding autodetection (UTF8)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/enc-HZ.phpt b/tests/unicode/enc-HZ.phpt
index 25c082a7fa..a5aabad0c9 100755
--- a/tests/unicode/enc-HZ.phpt
+++ b/tests/unicode/enc-HZ.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding (HZ)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/enc-ISO-2022-KR.phpt b/tests/unicode/enc-ISO-2022-KR.phpt
index 3e94bd77c5..23fe3b903a 100755
--- a/tests/unicode/enc-ISO-2022-KR.phpt
+++ b/tests/unicode/enc-ISO-2022-KR.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding (ISO-2022-KR)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/enc-JIS.phpt b/tests/unicode/enc-JIS.phpt
index 3470a70aca..5088a1c54f 100755
--- a/tests/unicode/enc-JIS.phpt
+++ b/tests/unicode/enc-JIS.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding (JIS)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/enc-SJIS.phpt b/tests/unicode/enc-SJIS.phpt
index 9d8f5cf484..b3661b8727 100755
--- a/tests/unicode/enc-SJIS.phpt
+++ b/tests/unicode/enc-SJIS.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Script encoding (SJIS)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/encrt-HZ.phpt b/tests/unicode/encrt-HZ.phpt
index 2a85bc981b..e87fb606a1 100755
--- a/tests/unicode/encrt-HZ.phpt
+++ b/tests/unicode/encrt-HZ.phpt
@@ -1,7 +1,8 @@
 --TEST--
 declare script encoding (HZ)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/encrt-ISO-2022-KR.phpt b/tests/unicode/encrt-ISO-2022-KR.phpt
index bfc46e9aac..8ef2c46a74 100755
--- a/tests/unicode/encrt-ISO-2022-KR.phpt
+++ b/tests/unicode/encrt-ISO-2022-KR.phpt
@@ -1,7 +1,8 @@
 --TEST--
 declare script encoding (ISO-2022-KR)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/encrt-JIS.phpt b/tests/unicode/encrt-JIS.phpt
index 3237e4e09a..4da9d884c9 100755
--- a/tests/unicode/encrt-JIS.phpt
+++ b/tests/unicode/encrt-JIS.phpt
@@ -1,7 +1,8 @@
 --TEST--
 declare script encoding (JIS)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/encrt-SJIS.phpt b/tests/unicode/encrt-SJIS.phpt
index c6c7013789..73cd4a185e 100755
--- a/tests/unicode/encrt-SJIS.phpt
+++ b/tests/unicode/encrt-SJIS.phpt
@@ -1,7 +1,8 @@
 --TEST--
 declare script encoding (SJIS)
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --INI--
-unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/normalize_001.phpt b/tests/unicode/normalize_001.phpt
index 798237d9a6..ae6ced7c97 100755
--- a/tests/unicode/normalize_001.phpt
+++ b/tests/unicode/normalize_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode identifiers normalization (${})
---INI--
-unicode.semantics=on
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --FILE--
 <?php
 ${"\u212B"} = "ok\n";
diff --git a/tests/unicode/normalize_002.phpt b/tests/unicode/normalize_002.phpt
index 1901fdefcf..cf8976f413 100755
--- a/tests/unicode/normalize_002.phpt
+++ b/tests/unicode/normalize_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode identifiers normalization ($$)
---INI--
-unicode.semantics=on
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --FILE--
 <?php
 $a = "\u212B";
diff --git a/tests/unicode/normalize_003.phpt b/tests/unicode/normalize_003.phpt
index bd686a4446..6bbfdecaa0 100755
--- a/tests/unicode/normalize_003.phpt
+++ b/tests/unicode/normalize_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode identifiers normalization (indirect function call)
---INI--
-unicode.semantics=on
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --FILE--
 <?php
 declare(encoding = "ISO-8859-1");
diff --git a/tests/unicode/normalize_004.phpt b/tests/unicode/normalize_004.phpt
index 35d8dca42f..9df79953e9 100755
--- a/tests/unicode/normalize_004.phpt
+++ b/tests/unicode/normalize_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode identifiers normalization ($GLOBALS[])
---INI--
-unicode.semantics=on
+--SKIPIF--
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --FILE--
 <?php
 $GLOBALS["\u212B"] = "ok\n";