Merge pull request #57 from m6w6/lc-utf8

avoid skipping test when current locale is C

diff --git a/tests/urlparser004.phpt b/tests/urlparser004.phpt
index d1cd1eea061a1ac4f362b6e49d2dc8913bf1f5cd..9172138eeb971b7330ae7a401a047f37e2712cf5 100644 (file)
--- 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 e369490f0586da548eb1d22797846fc2ab9c8e98..d701bf57c64b9b0db356d5af96b8dbb4ce4cd467 100644 (file)
--- 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 ae63ae7b4050e4eba43b60049a565d9736e0342e..e1675ce409f3985acce0f6af9be3767e4bd884bf 100644 (file)
--- 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 2187222c73b5bbe8ba477fc4bfc303aba83909e5..5f8efae457f0b15e6105d385868fa49303e18db6 100644 (file)
--- 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=¢#ø"