From: Nikita Popov Date: Fri, 31 May 2019 08:54:32 +0000 (+0200) Subject: Add CONFLCITS file for fpm X-Git-Tag: php-7.4.0alpha1~136 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96a11bee1c6541af98f54b3779b36b92e6c6b735;p=php Add CONFLCITS file for fpm We should not run FPM tests in parallel due to port clashes. --- diff --git a/sapi/fpm/tests/CONFLICTS b/sapi/fpm/tests/CONFLICTS new file mode 100644 index 0000000000..14c2e0b65a --- /dev/null +++ b/sapi/fpm/tests/CONFLICTS @@ -0,0 +1 @@ +fpm