X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=tests%2Fskipif.inc;h=76c3bd793576f73639a62860629055f7c79c6367;hp=4ab631e63d5b9b00b2e1be2c3efe174bfc3791bb;hb=a4f66fb42bb5203e9d1897a6cf554aa702ce0380;hpb=e867316f1364f589eec67cc684703c874984430b

diff --git a/tests/skipif.inc b/tests/skipif.inc
index 4ab631e..76c3bd7 100644
--- a/tests/skipif.inc
+++ b/tests/skipif.inc
@@ -1,7 +1,27 @@
 <?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() {
+	$locale = setlocale(LC_CTYPE, null);
+	if (stristr($locale, "utf") && substr($locale, -1) === "8") {
+		return true;
+	}
+	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,13 +40,23 @@ function skip_client_test($message = "skip need a client driver\n") {
 	}
 }
 
-function skip_http2_test($message = "skip need http2 support (nghttpd in PATH)\n") {
-	if (defined("http\\Client\\Curl\\HTTP_VERSION_2_0")) {
-		foreach (explode(":", $_ENV["PATH"]) as $path) {
-			if (is_executable($path . "/nghttpd")) {
-				return;
-			}
+function skip_curl_test($version) {
+	if (!version_compare(http\Client\Curl\Versions\CURL, $version, ">=")) {
+		die("skip need at least libcurl version $version\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(":", getenv("PATH")) as $path) {
+		if (is_executable($path . "/nghttpd")) {
+			return;
 		}
 	}
-	die($message);
-}
\ No newline at end of file
+	die("$message (nghttpd in PATH)\n");
+}