com php-src: Merge branch 'PHP-7.1': run-tests.php
| From: | Nikita Popov | Date: | Tue, 10 Jan 2017 22:32:46 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1': run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96680@lists.php.net to get a copy of this message | ||
Commit: ce90742ad59851cbc3bdfc347b5a99f33f30e10f
Author: Nikita Popov <nikic@php.net> Tue, 10 Jan 2017 23:32:46 +0100
Parents: 9b916b15a5c011ad1cd19b0831e6e2d3c246f6ff 5cee9dfe9a479c15d08f66a4baca83ed4e7ed288
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ce90742ad59851cbc3bdfc347b5a99f33f30e10f
Log:
Merge branch 'PHP-7.1'
Changed paths:
MM run-tests.php
Diff:
diff --cc run-tests.php
index 6e9d3be,4016288..4e2ac37
--- a/run-tests.php
+++ b/run-tests.php
@@@ -1609,11 -1590,16 +1609,16 @@@ TEST $fil
$info = " (warn: $m[1])";
}
}
+
+ if (!strncasecmp('xfail', ltrim($output), 5)) {
+ // Pretend we have an XFAIL section
+ $section_text['XFAIL'] = trim(substr(ltrim($output), 5));
+ }
}
}
-
+
if (!extension_loaded("zlib")
- && ( array_key_exists("GZIP_POST", $section_text)
+ && ( array_key_exists("GZIP_POST", $section_text)
|| array_key_exists("DEFLATE_POST", $section_text))
) {
$message = "ext/zlib required";