diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-03 09:58:03 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-03 09:58:03 +0100 |
| commit | 4cdd15d4146c6040639196787292765c604c34b3 (patch) | |
| tree | 422f8a34eb6e62b728f676d661413fe876e8fc1e /sapi/fpm/tests | |
| parent | 2015c7a48ee6266d7b0c9f752e7e96e078ede480 (diff) | |
| parent | aaf9cbb7eb6fa2e1266aab26d8f6402368f2a61c (diff) | |
| download | php-git-4cdd15d4146c6040639196787292765c604c34b3.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Disable parallelism for FPM tests
Diffstat (limited to 'sapi/fpm/tests')
| -rw-r--r-- | sapi/fpm/tests/CONFLICTS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/fpm/tests/CONFLICTS b/sapi/fpm/tests/CONFLICTS index 14c2e0b65a..d19bf9c39a 100644 --- a/sapi/fpm/tests/CONFLICTS +++ b/sapi/fpm/tests/CONFLICTS @@ -1 +1,3 @@ -fpm +# FPM tests have many spurious failures on Azure recently, +# try to run them without parallelism. +all |