Skip unicode tests in non-unicode mode

diff --git a/tests/unicode/autodetect-SCSU.phpt b/tests/unicode/autodetect-SCSU.phpt
index 12213a81bd1afe164be6fb9ba841357ddc6f079e..64d6601924efb4f4215eb407ce12c551f457513b 100755 (executable)
--- 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 f7a1d6bd3e5367400328b182ad73cddd1ba1d7b0..678b2332caace9f9f1eafb1fa8026509a68734d6 100755 (executable)
--- 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 4302029fee73ce8be6825f667960df617db2e61a..9c219f911968eed1eb6d4d21e69a58b401a3ee2c 100755 (executable)
--- 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 9378583f86a07227d6f91301381e2379ce8b4044..2b0c5b52732e50e19abfe8def3fc673ea2c324db 100755 (executable)
--- 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 a05711dfaa042f6e03b639a2c96b0cb706acbea0..f1041c8dce06655316cd63d677eed1cafe42daa8 100755 (executable)
--- 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 26ba3966dd22b83bc9af508e7ad5419d32b1c1df..d9a33a47d7a29cfebdd55ec75dacc55323309c0f 100755 (executable)
--- 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 29b561e9fb4b980ca7b2b46f867fef4b252f41cd..2f91be3497a2ae75e845b5b3c722da9e513ba4da 100755 (executable)
--- 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 25c082a7fa8f51e9a6ead7d922d9fcb27cd2b1f2..a5aabad0c9fd03d91d13cf5e30d01f0402330626 100755 (executable)
--- 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 3e94bd77c5e4e7322862ab09707f3b514bbd36e7..23fe3b903a6b960fcc177dbef0c831fdd6f45444 100755 (executable)
--- 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 3470a70acaab457b6aa37cfff35a573bc8f5993b..5088a1c54fdc18d26d830b512a357ebeffcf5cb6 100755 (executable)
--- 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 9d8f5cf48452aa3cd3fdf5786ebcd95ed85767cf..b3661b87277e9a63439afa510aaedfbc6d5160f6 100755 (executable)
--- 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 2a85bc981b1d1976f912a3ae9652037fcbd24089..e87fb606a1eab068f6ca93e1a7a494b3beae945b 100755 (executable)
--- 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 bfc46e9aac79c57b85435ab9ee3130d44cc910d0..8ef2c46a74ef4dc36ff903406c306deb73971f4a 100755 (executable)
--- 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 3237e4e09a4fe05a82cdab5687f3760c06e3c7d0..4da9d884c92db5c54335efea7cb765015f0ff1c3 100755 (executable)
--- 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 c6c7013789d34a59cc37a67baf73bfab2e9f4406..73cd4a185e8e28d217293bbede742692e484f168 100755 (executable)
--- 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 798237d9a62688c4ae3815797b6c2f38c5524de7..ae6ced7c973f064ac0476f7e5bc24a7b91189a89 100755 (executable)
--- 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 1901fdefcf95c4a5226657575c27169c1ebcea81..cf8976f41355ef6a2232bba5a7ef2ccf84a4697e 100755 (executable)
--- 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 bd686a44467047bde47d74ae687b1ebb7e830730..6bbfdecaa028db4e65e25ed4bbb74d1fbf503c8b 100755 (executable)
--- 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 35d8dca42fc204515eca8c938073cca054b95c68..9df79953e9f33ef1c188f59b687f14d4471ad42f 100755 (executable)
--- 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";