* Backported patches from `php-7.4` which fixes the env for all `gettext` and `zlib` tests. * Setting `--with-libxml-dir` is still needed for versions 7.2 and 7.3.wip/yesman
parent
6b096983f4
commit
af064a0e12
@ -0,0 +1,44 @@ |
||||
diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt
|
||||
index a0d22f4fcebf4846da6781f424f87821626de5ea..e650fe6909f555d04834f4c08f7fd0d354b783e2 100644
|
||||
--- a/ext/zlib/tests/bug55544.phpt
|
||||
+++ b/ext/zlib/tests/bug55544.phpt
|
||||
@@ -6,6 +6,9 @@ extension_loaded("zlib") or die("skip");
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die("skip not for windows");
|
||||
}
|
||||
+if (PHP_OS == "Darwin") {
|
||||
+ die("skip not for darwin");
|
||||
+}
|
||||
?>
|
||||
--INI--
|
||||
output_handler=ob_gzhandler
|
||||
diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt
|
||||
index c966b2cbc5b7..2f953168fa22 100644
|
||||
--- a/ext/zlib/tests/gzencode_variation1.phpt
|
||||
+++ b/ext/zlib/tests/gzencode_variation1.phpt
|
||||
@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) {
|
||||
if (!extension_loaded("zlib")) {
|
||||
print "skip - ZLIB extension not loaded";
|
||||
}
|
||||
+
|
||||
+if (PHP_OS == "Darwin") {
|
||||
+ print "skip - OS is encoded in headers, tested header is non Darwin";
|
||||
+}
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt
|
||||
index 94ac42a5f1cd..9160cf519751 100644
|
||||
--- a/ext/zlib/tests/gzencode_variation2.phpt
|
||||
+++ b/ext/zlib/tests/gzencode_variation2.phpt
|
||||
@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) {
|
||||
if (!extension_loaded("zlib")) {
|
||||
print "skip - ZLIB extension not loaded";
|
||||
}
|
||||
+
|
||||
+if (PHP_OS == "Darwin") {
|
||||
+ print "skip - OS is encoded in headers, tested header is non Darwin";
|
||||
+}
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
Loading…
Reference in new issue