From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 7 Oct 2016 07:25:34 +0000 (+0200)
Subject: avoid skipping test when current locale is C
X-Git-Tag: RELEASE_3_1_0~5^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=refs%2Fpull%2F57%2Fhead;p=m6w6%2Fext-http

avoid skipping test when current locale is C
---

diff --git a/tests/urlparser004.phpt b/tests/urlparser004.phpt
index d1cd1ee..9172138 100644
--- a/tests/urlparser004.phpt
+++ b/tests/urlparser004.phpt
@@ -4,13 +4,14 @@ url parser multibyte/locale
 <?php
 include "skipif.inc";
 if (!defined("http\\Url::PARSE_MBLOC") or
-	!stristr(setlocale(LC_CTYPE, NULL), "utf")) {
+	!stristr(setlocale(LC_CTYPE, "C.UTF-8"), "utf")) {
 	die("skip need http\\Url::PARSE_MBLOC support and LC_CTYPE=*.UTF-8");
 }
 ?>
 --FILE--
 <?php
 echo "Test\n";
+setlocale(LC_CTYPE, "C.UTF-8");
 
 $urls = array(
 	"s\xc3\xa7heme:",
diff --git a/tests/urlparser006.phpt b/tests/urlparser006.phpt
index e369490..d701bf5 100644
--- a/tests/urlparser006.phpt
+++ b/tests/urlparser006.phpt
@@ -5,13 +5,14 @@ url parser multibyte/locale/idna
 include "skipif.inc";
 if (!defined("http\\Url::PARSE_MBLOC") or
 	!defined("http\\Url::PARSE_TOIDN_2003") or
-	!stristr(setlocale(LC_CTYPE, NULL), ".utf")) {
+	!stristr(setlocale(LC_CTYPE, "C.UTF-8"), ".utf")) {
 	die("skip need http\\Url::PARSE_MBLOC|http\\Url::PARSE_TOIDN_2003 support and LC_CTYPE=*.UTF-8");
 }
 ?>
 --FILE--
 <?php
 echo "Test\n";
+setlocale(LC_CTYPE, "C.UTF-8");
 
 $urls = array(
 	"s\xc3\xa7heme:",
diff --git a/tests/urlparser010.phpt b/tests/urlparser010.phpt
index ae63ae7..e1675ce 100644
--- a/tests/urlparser010.phpt
+++ b/tests/urlparser010.phpt
@@ -4,7 +4,7 @@ url parser multibyte/locale/topct
 <?php
 include "skipif.inc";
 if (!defined("http\\Url::PARSE_MBLOC") or
-	!stristr(setlocale(LC_CTYPE, NULL), ".utf")) {
+	!stristr(setlocale(LC_CTYPE, "C.UTF-8"), ".utf")) {
 	die("skip need http\\Url::PARSE_MBLOC support and LC_CTYPE=*.UTF-8");
 }
 
@@ -12,6 +12,7 @@ if (!defined("http\\Url::PARSE_MBLOC") or
 --FILE--
 <?php
 echo "Test\n";
+setlocale(LC_CTYPE, "C.UTF-8");
 
 $urls = array(
 	"http://mike:paßwort@𐌀𐌁𐌂.it/for/€/?by=¢#ø"
diff --git a/tests/urlparser012.phpt b/tests/urlparser012.phpt
index 2187222..5f8efae 100644
--- a/tests/urlparser012.phpt
+++ b/tests/urlparser012.phpt
@@ -5,7 +5,7 @@ url parser multibyte/locale/topct
 include "skipif.inc";
 if (!defined("http\\Url::PARSE_MBLOC") or
 	!defined("http\\Url::PARSE_TOIDN") or
-	!stristr(setlocale(LC_CTYPE, NULL), ".utf")) {
+	!stristr(setlocale(LC_CTYPE, "C.UTF-8"), ".utf")) {
 	die("skip need http\\Url::PARSE_MBLOC|http\Url::PARSE_TOIDN support and LC_CTYPE=*.UTF-8");
 }
 
@@ -13,6 +13,7 @@ if (!defined("http\\Url::PARSE_MBLOC") or
 --FILE--
 <?php
 echo "Test\n";
+setlocale(LC_CTYPE, "C.UTF-8");
 
 $urls = array(
 	"http://mike:paßwort@𐌀𐌁𐌂.it/for/€/?by=¢#ø"