cvs: php4 /ext/standard/tests/strings htmlentities02.phpt htmlentities03.phpt htmlentities04.phpt

moriyoshi Wed Nov 6 10:06:35 2002 EDT Modified files: /php4/ext/standard/tests/strings htmlentities02.phpt htmlentities03.phpt htmlentities04.phpt Log: Made skip conditions stricter. Index: php4/ext/standard/tests/strings/htmlentities02.phpt diff -u php4/ext/standard/tests/strings/htmlentities02.phpt:1.4 php4/ext/standard/tests/strings/htmlentities02.phpt:1.5 --- php4/ext/standard/tests/strings/htmlentities02.phpt:1.4 Sun Nov 3 03:37:59 2002 +++ php4/ext/standard/tests/strings/htmlentities02.phpt Wed Nov 6 10:06:35 2002 @@ -1,7 +1,12 @@ --TEST-- htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) --SKIPIF-- -<?php setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15") or die("skip setlocale() failed\n"); ?> +<?php +$result = (bool)setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15"); +if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) === false) { + die("skip setlocale() failed\n"); +} +?> --INI-- output_handler= mbstring.internal_encoding=pass Index: php4/ext/standard/tests/strings/htmlentities03.phpt diff -u php4/ext/standard/tests/strings/htmlentities03.phpt:1.4 php4/ext/standard/tests/strings/htmlentities03.phpt:1.5 --- php4/ext/standard/tests/strings/htmlentities03.phpt:1.4 Sun Nov 3 03:37:59 2002 +++ php4/ext/standard/tests/strings/htmlentities03.phpt Wed Nov 6 10:06:35 2002 @@ -1,7 +1,12 @@ --TEST-- htmlentities() test 3 (setlocale / de_DE.ISO-8859-1) --SKIPIF-- -<?php setlocale(LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1") or die("skip setlocale() failed\n"); ?> +<?php +$result = (bool)setlocale(LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1"); +if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) === false) { + die("skip setlocale() failed\n"); +} +?> --INI-- output_handler= mbstring.internal_encoding=pass Index: php4/ext/standard/tests/strings/htmlentities04.phpt diff -u php4/ext/standard/tests/strings/htmlentities04.phpt:1.4 php4/ext/standard/tests/strings/htmlentities04.phpt:1.5 --- php4/ext/standard/tests/strings/htmlentities04.phpt:1.4 Sun Nov 3 03:37:59 2002 +++ php4/ext/standard/tests/strings/htmlentities04.phpt Wed Nov 6 10:06:35 2002 @@ -1,7 +1,12 @@ --TEST-- htmlentities() test 4 (setlocale / ja_JP.EUC-JP) --SKIPIF-- -<?php setlocale(LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP") or die("skip setlocale() failed\n"); ?> +<?php +$result = (bool)setlocale(LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP"); +if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) === false) { + die("skip setlocale() failed\n"); +} +?> --INI-- output_handler= mbstring.internal_encoding=pass