From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Wed, 6 Nov 2002 15:06:35 +0000 (+0000)
Subject: Made skip conditions stricter.
X-Git-Tag: php-4.3.0RC1~227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4460fa5a315a3910674c018990bd497cc943e53;p=php

Made skip conditions stricter.
---

diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index 38fa615bff..6156c0b0e1 100644
--- 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 206c7d33e7..427166afbf 100644
--- 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 2d8aff3582..db27fb415a 100644
--- 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