Merge branch 'PHP-7.0'

* PHP-7.0: mark frequent intermittent fpm test with XFAIL
Sannis · Apr 18, 2016 · 1380a6c · 1380a6c
2 parents 67f5339 + 8f35ee4
commit 1380a6c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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