summaryrefslogtreecommitdiff
path: root/sapi/fpm/tests
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2016-04-18 09:04:55 +0200
committerFerenc Kovacs <tyrael@php.net>2016-04-18 09:04:55 +0200
commit8f35ee49ee507c1c8600eb3d4532223177a28635 (patch)
tree4e243c9b99e43f6c7c0af7fe19245afcce0e6958 /sapi/fpm/tests
parent50cfe0a15c4b2c9781b1164fe801c99c57e0211e (diff)
parent3a16f511d910a903b7172aa899312b69fbe4fdf3 (diff)
downloadphp-git-8f35ee49ee507c1c8600eb3d4532223177a28635.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: mark frequent intermittent fpm test with XFAIL
Diffstat (limited to 'sapi/fpm/tests')
-rw-r--r--sapi/fpm/tests/010.phpt6
1 files changed, 6 insertions, 0 deletions
diff --git a/sapi/fpm/tests/010.phpt b/sapi/fpm/tests/010.phpt
index f3b768f319..49e1a07923 100644
--- a/sapi/fpm/tests/010.phpt
+++ b/sapi/fpm/tests/010.phpt
@@ -2,6 +2,12 @@
FPM: Test status page
--SKIPIF--
<?php include "skipif.inc"; ?>
+--XFAIL--
+randomly intermittently failing all the time in CI, with diff:
+017+ active processes: 0
+018+ total processes: 1
+017- active processes: 1
+018- total processes: 2
--FILE--
<?php