Made skip conditions stricter.

diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index 38fa615bffbb4615ef2a6ef52e666678969a5c07..6156c0b0e1bd184375086869d56e813a29e27fa8 100644 (file)
--- a/ext/standard/tests/strings/htmlentities02.phpt
+++ b/ext/standard/tests/strings/htmlentities02.phpt
@@ -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

diff --git a/ext/standard/tests/strings/htmlentities03.phpt b/ext/standard/tests/strings/htmlentities03.phpt
index 206c7d33e78102b98b02a479fd7655ff7d48b7de..427166afbf9bab1b7de56dafc67f498a7a7f4851 100644 (file)
--- a/ext/standard/tests/strings/htmlentities03.phpt
+++ b/ext/standard/tests/strings/htmlentities03.phpt
@@ -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

diff --git a/ext/standard/tests/strings/htmlentities04.phpt b/ext/standard/tests/strings/htmlentities04.phpt
index 2d8aff3582a8b6555928ab4b95a9a921f8af45b1..db27fb415a07a4654b19394f9d287d8a99aa9011 100644 (file)
--- a/ext/standard/tests/strings/htmlentities04.phpt
+++ b/ext/standard/tests/strings/htmlentities04.phpt
@@ -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