X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fskipif.inc;h=a9e161ab48722e20c0e57741fb1226effab20101;hb=9a02b1a9ef8dc62a241148405be8058e0df4250e;hp=cceeaf077e82820daeea9e84423986ac1524177a;hpb=95c6c900d04096d332c422e3f597186b7184c5ab;p=m6w6%2Fext-http

diff --git a/tests/skipif.inc b/tests/skipif.inc
index cceeaf0..a9e161a 100644
--- a/tests/skipif.inc
+++ b/tests/skipif.inc
@@ -1,7 +1,23 @@
 <?php
-function _ext($ext) { extension_loaded($ext) or die("skip $ext extension needed\n"); }
 _ext("http");
 
+function _ext($ext) { 
+	if (!extension_loaded($ext)) {
+		die("skip $ext extension needed\n");
+	}
+}
+
+function utf8locale() {
+	if (stristr(setlocale(LC_CTYPE, "C.UTF-8"), "utf")) {
+		return true;
+	}
+	$locale = setlocale(LC_CTYPE, null);
+	if (stristr($locale, "utf") && substr($locale, -1) === "8") {
+		return true;
+	}
+	return false;
+}
+
 function skip_online_test($message = "skip test requiring internet connection\n") {
 	if (getenv("SKIP_ONLINE_TESTS")) {
 		die($message);
@@ -20,11 +36,17 @@ function skip_client_test($message = "skip need a client driver\n") {
 	}
 }
 
-function skip_http2_test($message = "skip need http2 support (nghttpd in PATH)\n") {
+function skip_http2_test($message = "skip need http2 support") {
+	if (!defined("http\\Client\\Curl\\HTTP_VERSION_2_0")) {
+		die("$message (HTTP_VERSION_2_0)\n");
+	}
+	if (!(http\Client\Curl\FEATURES & http\Client\Curl\Features\HTTP2)) {
+		die("$message (FEATURES & HTTP2)\n");
+	}
 	foreach (explode(":", $_ENV["PATH"]) as $path) {
 		if (is_executable($path . "/nghttpd")) {
 			return;
 		}
 	}
-	die($message);
-}
\ No newline at end of file
+	die("$message (nghttpd in PATH)\n");
+}