diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-23 12:36:04 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-23 12:36:04 +0200 |
| commit | 40d162e4237a076cffc841e5e42e98fa64715251 (patch) | |
| tree | bfad798808e9a344da05e673f82080c5c071779f | |
| parent | f7a3cb4c39a795e47cc3cbf024f4235331736317 (diff) | |
| parent | c4639a2debbdf6ac84ee334b9382d113a4862a52 (diff) | |
| download | php-git-40d162e4237a076cffc841e5e42e98fa64715251.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Restore XFAIL on fpm test
| -rw-r--r-- | sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt index b1b8a65c68..4a8fbf3a56 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt @@ -2,6 +2,8 @@ FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed) --SKIPIF-- <?php include "skipif.inc"; ?> +--XFAIL-- +Fails intermittently --FILE-- <?php |