From a6e2455a6d3b0160274e784aa3da8a350a2600c9 Mon Sep 17 00:00:00 2001 From: Tyson Andre Date: Sat, 27 Nov 2021 13:53:24 -0500 Subject: [PATCH] Don't run sapi/fpm tests in parallel with other fpm tests See discussion on https://github.com/php/php-src/pull/7561 fpm tests have been spuriously failing in CI, with 2 parallel workers on 2 CPUs. `make test TESTS='sapi/fpm/tests -j8'` fails locally for me without this change They're trying to listen on IPv4 on 127.0.0.1 on the same port as other tests (e.g. helper getPort()=9008 on 64-bit architecture (PHP_INT_SIZE=8)). So tests will fail if 1. php-fpm is still running from another test in parallel. 2. a request is sent to a server for a different test. --- sapi/fpm/tests/bug68381-log-level-warning.phpt | 2 ++ sapi/fpm/tests/bug68391-conf-include-order.phpt | 2 ++ sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt | 2 ++ sapi/fpm/tests/bug68421-ipv6-access-log.phpt | 2 ++ sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt | 2 ++ sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt | 2 ++ sapi/fpm/tests/bug68442-signal-reload.phpt | 2 ++ sapi/fpm/tests/bug68458-pm-no-start-server.phpt | 2 ++ sapi/fpm/tests/bug69625-no-script-filename.phpt | 2 ++ sapi/fpm/tests/bug72573-http-proxy.phpt | 2 ++ sapi/fpm/tests/bug73342-nonblocking-stdio.phpt | 2 ++ sapi/fpm/tests/bug74083-concurrent-reload.phpt | 2 ++ sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt | 2 ++ sapi/fpm/tests/bug76601-reload-child-signals.phpt | 2 ++ sapi/fpm/tests/bug77934-reload-process-control.phpt | 2 ++ sapi/fpm/tests/bug78323.phpt | 2 ++ sapi/fpm/tests/bug78599-path-info-underflow.phpt | 2 ++ sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt | 2 ++ sapi/fpm/tests/bug80849-fpm.phpt | 2 ++ sapi/fpm/tests/fastcgi_finish_request_basic.phpt | 2 ++ sapi/fpm/tests/fpm_get_status_basic.phpt | 2 ++ sapi/fpm/tests/getallheaders.phpt | 2 ++ sapi/fpm/tests/log-bm-in-shutdown-fn.phpt | 2 ++ sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt | 2 ++ sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt | 2 ++ sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt | 2 ++ sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt | 2 ++ sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt | 2 ++ sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt | 2 ++ sapi/fpm/tests/log-bwd-msg-with-nl.phpt | 2 ++ sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt | 2 ++ sapi/fpm/tests/log-bwd-multiple-msgs.phpt | 2 ++ sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt | 2 ++ sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt | 2 ++ sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt | 2 ++ sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt | 2 ++ sapi/fpm/tests/log-bwp-realloc-buffer.phpt | 2 ++ sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt | 2 ++ sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt | 2 ++ sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt | 2 ++ sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt | 2 ++ sapi/fpm/tests/main-global-prefix.phpt | 2 ++ sapi/fpm/tests/main-version.phpt | 2 ++ sapi/fpm/tests/php-admin-doc-root.phpt | 2 ++ sapi/fpm/tests/pm-max-spawn-rate-config.phpt | 2 ++ sapi/fpm/tests/pm-max-spawn-rate-run.phpt | 2 ++ sapi/fpm/tests/pool-apparmor-basic.phpt | 2 ++ sapi/fpm/tests/pool-prefix.phpt | 2 ++ sapi/fpm/tests/proc-idle-timeout.phpt | 2 ++ sapi/fpm/tests/proc-no-start-server.phpt | 2 ++ sapi/fpm/tests/proc-user-ignored.phpt | 2 ++ sapi/fpm/tests/reload-uses-sigkill-as-last-measure.phpt | 2 ++ sapi/fpm/tests/socket-invalid-allowed-clients.phpt | 2 ++ sapi/fpm/tests/socket-ipv4-allowed-clients.phpt | 2 ++ sapi/fpm/tests/socket-ipv4-basic.phpt | 2 ++ sapi/fpm/tests/socket-ipv4-fallback.phpt | 2 ++ sapi/fpm/tests/socket-ipv6-any.phpt | 2 ++ sapi/fpm/tests/socket-ipv6-basic.phpt | 2 ++ sapi/fpm/tests/socket-uds-acl.phpt | 2 ++ sapi/fpm/tests/socket-uds-basic.phpt | 2 ++ sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt | 2 ++ sapi/fpm/tests/socket-uds-numeric-ugid.phpt | 2 ++ sapi/fpm/tests/status-basic.phpt | 2 ++ sapi/fpm/tests/status-listen.phpt | 2 ++ 64 files changed, 128 insertions(+) diff --git a/sapi/fpm/tests/bug68381-log-level-warning.phpt b/sapi/fpm/tests/bug68381-log-level-warning.phpt index b9066cd05164f..1f7c10afb2d44 100644 --- a/sapi/fpm/tests/bug68381-log-level-warning.phpt +++ b/sapi/fpm/tests/bug68381-log-level-warning.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug68381 - Log messages with warning level only +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt b/sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt index 0998cf0acafc7..27f643792f1aa 100644 --- a/sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt +++ b/sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug68428 - IPv6 allowed client only +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug68458-pm-no-start-server.phpt b/sapi/fpm/tests/bug68458-pm-no-start-server.phpt index c0c69b64b9975..521bcec8b9568 100644 --- a/sapi/fpm/tests/bug68458-pm-no-start-server.phpt +++ b/sapi/fpm/tests/bug68458-pm-no-start-server.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug68458 - Missing pm.start_servers should emit notice instead of warning +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug72573-http-proxy.phpt b/sapi/fpm/tests/bug72573-http-proxy.phpt index ffa60d97134e8..3298ad9c0bf1f 100644 --- a/sapi/fpm/tests/bug72573-http-proxy.phpt +++ b/sapi/fpm/tests/bug72573-http-proxy.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug72573 - HTTP_PROXY - CVE-2016-5385 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt b/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt index 3cf44d11ffabc..6d9bbf33575e1 100644 --- a/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt +++ b/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug73342 - Non-blocking stdin +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug74083-concurrent-reload.phpt b/sapi/fpm/tests/bug74083-concurrent-reload.phpt index 8b4b690e96201..5ba429bb676d0 100644 --- a/sapi/fpm/tests/bug74083-concurrent-reload.phpt +++ b/sapi/fpm/tests/bug74083-concurrent-reload.phpt @@ -1,5 +1,7 @@ --TEST-- Concurrent reload signals should not kill PHP-FPM master process. (Bug: #74083) +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug76601-reload-child-signals.phpt b/sapi/fpm/tests/bug76601-reload-child-signals.phpt index f095ed667ca83..60a37c01f4966 100644 --- a/sapi/fpm/tests/bug76601-reload-child-signals.phpt +++ b/sapi/fpm/tests/bug76601-reload-child-signals.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug76601 children should not ignore signals during concurrent reloads +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug78323.phpt b/sapi/fpm/tests/bug78323.phpt index cf91020573144..1b7ea525d4be7 100644 --- a/sapi/fpm/tests/bug78323.phpt +++ b/sapi/fpm/tests/bug78323.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Bug #78323 Test exit code for invalid parameters +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug78599-path-info-underflow.phpt b/sapi/fpm/tests/bug78599-path-info-underflow.phpt index edd4e0d496998..33fc43b36f4ed 100644 --- a/sapi/fpm/tests/bug78599-path-info-underflow.phpt +++ b/sapi/fpm/tests/bug78599-path-info-underflow.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug78599 - env_path_info underflow - CVE-2019-11043 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt b/sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt index 9c05471b67410..6e86d287e7cae 100644 --- a/sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt +++ b/sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug80024 - Duplication of info about inherited socket after pool removing +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug80849-fpm.phpt b/sapi/fpm/tests/bug80849-fpm.phpt index abe179368b7ee..fb1b2437dccc5 100644 --- a/sapi/fpm/tests/bug80849-fpm.phpt +++ b/sapi/fpm/tests/bug80849-fpm.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #80849 (HTTP Status header truncation) +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/fastcgi_finish_request_basic.phpt b/sapi/fpm/tests/fastcgi_finish_request_basic.phpt index 939782fa312d7..9ab625b8db54f 100644 --- a/sapi/fpm/tests/fastcgi_finish_request_basic.phpt +++ b/sapi/fpm/tests/fastcgi_finish_request_basic.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Function fastcgi_finish_request basic test +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/fpm_get_status_basic.phpt b/sapi/fpm/tests/fpm_get_status_basic.phpt index d72a1f4d70aca..b099b03e4b3bd 100644 --- a/sapi/fpm/tests/fpm_get_status_basic.phpt +++ b/sapi/fpm/tests/fpm_get_status_basic.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Function fpm_get_status basic test +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt index 90ecae3e449af..4e1e997029968 100644 --- a/sapi/fpm/tests/getallheaders.phpt +++ b/sapi/fpm/tests/getallheaders.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Function getallheaders basic test +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt b/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt index f968bf9f08bcf..099f7f6399150 100644 --- a/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt +++ b/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Log message in shutdown function +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt b/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt index 940d0df6e9abd..949d1e541972c 100644 --- a/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt +++ b/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered message output log with limit 1024 and msg 80 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt b/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt index 5354671ee2a70..cd2af94c6c1c5 100644 --- a/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt +++ b/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered message output log with limit 2048 and msg 4000 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt b/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt index 65524287459dd..13611f6396933 100644 --- a/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt +++ b/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with limit 1050 with 2048 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt b/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt index c528804292737..dc7c90e563b4c 100644 --- a/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt +++ b/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with limit 1050 with 2900 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt b/sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt index 2259ecb1493cd..278f2a0218efc 100644 --- a/sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt +++ b/sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with limit 64 fails because it is too low +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt b/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt index fc8fbe1fe8ea1..3e945b8eba774 100644 --- a/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt +++ b/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with limit 8000 with 4096 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwd-msg-with-nl.phpt b/sapi/fpm/tests/log-bwd-msg-with-nl.phpt index 0fdaf105493e6..9b3110abac7cd 100644 --- a/sapi/fpm/tests/log-bwd-msg-with-nl.phpt +++ b/sapi/fpm/tests/log-bwd-msg-with-nl.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with msg containing new lines +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 4a8fbf3a56e25..1fe10b2a79256 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed) +--CONFLICTS-- +fpm --SKIPIF-- --XFAIL-- diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt index d328aff9db243..319a90f8de5b7 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with multiple continuous messages +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt b/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt index 5a62285eda9dd..2ee8d80b8e73c 100644 --- a/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt +++ b/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output plain log with limit 1024 and msg 120 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt b/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt index 10674935cce9a..475b57ac63c61 100644 --- a/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt +++ b/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output plain log with limit 1500 and msg 3300 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt b/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt index 01b00d44853b4..4986b22732575 100644 --- a/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt +++ b/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output plain log with msg with flush split in buffer +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt b/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt index 63b2555de76ed..f805835d2aae4 100644 --- a/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt +++ b/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output plain log with msg with flush split in buffer +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwp-realloc-buffer.phpt b/sapi/fpm/tests/log-bwp-realloc-buffer.phpt index 3371bf8330c88..d24450673fee9 100644 --- a/sapi/fpm/tests/log-bwp-realloc-buffer.phpt +++ b/sapi/fpm/tests/log-bwp-realloc-buffer.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug81513 - Buffered worker output plain log stream reallocation +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt b/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt index 5162206cdd03f..92d42592fc7b1 100644 --- a/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt +++ b/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Direct worker output decorated log with limit 1050 with 2048 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt b/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt index fe08be6d3cbad..770caf25cc0a3 100644 --- a/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt +++ b/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Direct worker output decorated log with limit 1050 with 2900 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt b/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt index 351473fc2cfa8..f1fb22541eebc 100644 --- a/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt +++ b/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Direct worker output decorated log with limit 8000 with 4096 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt b/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt index 61cb92331ebb4..dd67caf0c58dd 100644 --- a/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt +++ b/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Direct worker output plain log with limit 1000 and msg 2000 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/main-global-prefix.phpt b/sapi/fpm/tests/main-global-prefix.phpt index 44486e4ed3288..095e54ab69e2e 100644 --- a/sapi/fpm/tests/main-global-prefix.phpt +++ b/sapi/fpm/tests/main-global-prefix.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Main invocation with prefix +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/main-version.phpt b/sapi/fpm/tests/main-version.phpt index 40ea45ef01026..e23acea80f597 100644 --- a/sapi/fpm/tests/main-version.phpt +++ b/sapi/fpm/tests/main-version.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: version string +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/php-admin-doc-root.phpt b/sapi/fpm/tests/php-admin-doc-root.phpt index a078c3aa25267..24f2d98c21529 100644 --- a/sapi/fpm/tests/php-admin-doc-root.phpt +++ b/sapi/fpm/tests/php-admin-doc-root.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: php_admin_value doc_root usage +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/pm-max-spawn-rate-config.phpt b/sapi/fpm/tests/pm-max-spawn-rate-config.phpt index 8b5f6b4eb6404..08192dee460a9 100644 --- a/sapi/fpm/tests/pm-max-spawn-rate-config.phpt +++ b/sapi/fpm/tests/pm-max-spawn-rate-config.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: set pm.max_spawn_rate +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/socket-ipv4-fallback.phpt b/sapi/fpm/tests/socket-ipv4-fallback.phpt index f0a8301916f7d..68bf329bd7514 100644 --- a/sapi/fpm/tests/socket-ipv4-fallback.phpt +++ b/sapi/fpm/tests/socket-ipv4-fallback.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Socket port connection falls back to IPv4 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt b/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt index 885fd4d075076..b337db1a5e406 100644 --- a/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt +++ b/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: UNIX socket owner and group settings can be numeric +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/status-listen.phpt b/sapi/fpm/tests/status-listen.phpt index c6476c0332052..53e95d966e937 100644 --- a/sapi/fpm/tests/status-listen.phpt +++ b/sapi/fpm/tests/status-listen.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Status listen test +--CONFLICTS-- +fpm --SKIPIF-- --FILE--