diff --git a/reg-tests/balance/balance-rr.vtc b/reg-tests/balance/balance-rr.vtc index 908a4f9af..50af85a30 100644 --- a/reg-tests/balance/balance-rr.vtc +++ b/reg-tests/balance/balance-rr.vtc @@ -21,7 +21,7 @@ server s4 { txresp -hdr "Server: s4" } -repeat 2 -start -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/balance/balance-uri-path-only.vtc b/reg-tests/balance/balance-uri-path-only.vtc index f1291ee24..348067a0f 100644 --- a/reg-tests/balance/balance-uri-path-only.vtc +++ b/reg-tests/balance/balance-uri-path-only.vtc @@ -22,7 +22,7 @@ server s4 { txresp -hdr "Server: s4" -body "s4" } -repeat 5 -start -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/balance/balance-uri.vtc b/reg-tests/balance/balance-uri.vtc index e67883567..baeb044ab 100644 --- a/reg-tests/balance/balance-uri.vtc +++ b/reg-tests/balance/balance-uri.vtc @@ -21,7 +21,7 @@ server s4 { txresp -hdr "Server: s4" } -repeat 2 -start -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/cache/basic.vtc b/reg-tests/cache/basic.vtc index 377cbb379..43ae58f4a 100644 --- a/reg-tests/cache/basic.vtc +++ b/reg-tests/cache/basic.vtc @@ -22,7 +22,7 @@ server s1 { chunkedlen 0 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/cache/caching_rules.vtc b/reg-tests/cache/caching_rules.vtc index a488875b3..66a821ac9 100644 --- a/reg-tests/cache/caching_rules.vtc +++ b/reg-tests/cache/caching_rules.vtc @@ -113,7 +113,7 @@ server s2 { -bodylen 170 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/cache/expires.vtc b/reg-tests/cache/expires.vtc index ee5cd775a..9a946dab7 100644 --- a/reg-tests/cache/expires.vtc +++ b/reg-tests/cache/expires.vtc @@ -39,7 +39,7 @@ server s3 { chunkedlen 0 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/cache/if-modified-since.vtc b/reg-tests/cache/if-modified-since.vtc index 1fd9a931a..c0c85ee20 100644 --- a/reg-tests/cache/if-modified-since.vtc +++ b/reg-tests/cache/if-modified-since.vtc @@ -39,7 +39,7 @@ server s1 { chunkedlen 0 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/cache/if-none-match.vtc b/reg-tests/cache/if-none-match.vtc index 3dcaec57c..69f2f0086 100644 --- a/reg-tests/cache/if-none-match.vtc +++ b/reg-tests/cache/if-none-match.vtc @@ -24,7 +24,7 @@ server s1 { chunkedlen 0 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/cache/post_on_entry.vtc b/reg-tests/cache/post_on_entry.vtc index 66c89e4e4..28d1e9878 100644 --- a/reg-tests/cache/post_on_entry.vtc +++ b/reg-tests/cache/post_on_entry.vtc @@ -22,7 +22,7 @@ server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/cache/sample_fetches.vtc b/reg-tests/cache/sample_fetches.vtc index c2b99c20c..be73dd504 100644 --- a/reg-tests/cache/sample_fetches.vtc +++ b/reg-tests/cache/sample_fetches.vtc @@ -41,7 +41,7 @@ server s3 { chunkedlen 0 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/cache/vary.vtc b/reg-tests/cache/vary.vtc index 782a76ca7..612bfadd2 100644 --- a/reg-tests/cache/vary.vtc +++ b/reg-tests/cache/vary.vtc @@ -165,7 +165,7 @@ server s2 { -bodylen 57 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/cache/vary_accept_encoding.vtc b/reg-tests/cache/vary_accept_encoding.vtc index 4b828a86a..3213b6a87 100644 --- a/reg-tests/cache/vary_accept_encoding.vtc +++ b/reg-tests/cache/vary_accept_encoding.vtc @@ -91,7 +91,7 @@ server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/checks/1be_40srv_odd_health_checks.vtc b/reg-tests/checks/1be_40srv_odd_health_checks.vtc index d0f3be53a..86a6b2136 100644 --- a/reg-tests/checks/1be_40srv_odd_health_checks.vtc +++ b/reg-tests/checks/1be_40srv_odd_health_checks.vtc @@ -56,7 +56,7 @@ server s37 {} -start server s38 {} -start server s39 {} -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/40be_2srv_odd_health_checks.vtc b/reg-tests/checks/40be_2srv_odd_health_checks.vtc index cbd4fc00e..4293d6781 100644 --- a/reg-tests/checks/40be_2srv_odd_health_checks.vtc +++ b/reg-tests/checks/40be_2srv_odd_health_checks.vtc @@ -238,7 +238,7 @@ server s35 {} -start server s37 {} -start server s39 {} -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/4be_1srv_health_checks.vtc b/reg-tests/checks/4be_1srv_health_checks.vtc index 02564be54..7b0d6ca65 100644 --- a/reg-tests/checks/4be_1srv_health_checks.vtc +++ b/reg-tests/checks/4be_1srv_health_checks.vtc @@ -92,7 +92,7 @@ syslog S4 -level notice { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc b/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc index 3d3649125..6a521c9bf 100644 --- a/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc +++ b/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc @@ -54,7 +54,7 @@ server s2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/agent-check.vtc b/reg-tests/checks/agent-check.vtc index 5cf51c658..b6fac3261 100644 --- a/reg-tests/checks/agent-check.vtc +++ b/reg-tests/checks/agent-check.vtc @@ -14,7 +14,7 @@ server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/http-check-expect.vtc b/reg-tests/checks/http-check-expect.vtc index 118eef6d8..2f43dff64 100644 --- a/reg-tests/checks/http-check-expect.vtc +++ b/reg-tests/checks/http-check-expect.vtc @@ -23,7 +23,7 @@ syslog S1 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded.*code: 202" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/http-check-send.vtc b/reg-tests/checks/http-check-send.vtc index 530ad7566..7435fdd17 100644 --- a/reg-tests/checks/http-check-send.vtc +++ b/reg-tests/checks/http-check-send.vtc @@ -108,7 +108,7 @@ syslog S6 -level notice { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/http-check.vtc b/reg-tests/checks/http-check.vtc index 31ef87abb..a03bbbde7 100644 --- a/reg-tests/checks/http-check.vtc +++ b/reg-tests/checks/http-check.vtc @@ -89,7 +89,7 @@ syslog S1 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be[0-9]/srv succeeded.*code: 200" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/http-monitor-uri.vtc b/reg-tests/checks/http-monitor-uri.vtc index 26e6e8136..215d7a0bc 100644 --- a/reg-tests/checks/http-monitor-uri.vtc +++ b/reg-tests/checks/http-monitor-uri.vtc @@ -6,7 +6,7 @@ varnishtest "Test the HTTP directive monitor-uri" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/ldap-check.vtc b/reg-tests/checks/ldap-check.vtc index 38204bf3b..24ac0bef8 100644 --- a/reg-tests/checks/ldap-check.vtc +++ b/reg-tests/checks/ldap-check.vtc @@ -49,7 +49,7 @@ syslog S4 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv succeeded, reason: Layer7 check passed.+info: \"Success\".+check duration: [[:digit:]]+ms, status: 1/1 UP." } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/mysql-check.vtc b/reg-tests/checks/mysql-check.vtc index 360013806..96605676f 100644 --- a/reg-tests/checks/mysql-check.vtc +++ b/reg-tests/checks/mysql-check.vtc @@ -62,7 +62,7 @@ syslog S5 -level notice { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/pgsql-check.vtc b/reg-tests/checks/pgsql-check.vtc index 5003e7df1..c64d5b748 100644 --- a/reg-tests/checks/pgsql-check.vtc +++ b/reg-tests/checks/pgsql-check.vtc @@ -47,7 +47,7 @@ syslog S4 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv succeeded, reason: Layer7 check passed.+info: \"PostgreSQL server is ok\".+check duration: [[:digit:]]+ms, status: 1/1 UP." } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/redis-check.vtc b/reg-tests/checks/redis-check.vtc index 3c74c93e8..e65b3bc39 100644 --- a/reg-tests/checks/redis-check.vtc +++ b/reg-tests/checks/redis-check.vtc @@ -28,7 +28,7 @@ syslog S2 -level notice { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/smtp-check.vtc b/reg-tests/checks/smtp-check.vtc index 6a5f7b79d..fa16ca1be 100644 --- a/reg-tests/checks/smtp-check.vtc +++ b/reg-tests/checks/smtp-check.vtc @@ -63,7 +63,7 @@ syslog S5 -level notice { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/spop-check.vtc b/reg-tests/checks/spop-check.vtc index 8a7fbd3ad..c022dac3a 100644 --- a/reg-tests/checks/spop-check.vtc +++ b/reg-tests/checks/spop-check.vtc @@ -47,7 +47,7 @@ syslog S4 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be4/srv failed, reason: Layer7 invalid response.+info: \"unsupported version\".+check duration: [[:digit:]]+ms, status: 0/1 DOWN." } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/ssl-hello-check.vtc b/reg-tests/checks/ssl-hello-check.vtc index a44b6e15c..704945f5b 100644 --- a/reg-tests/checks/ssl-hello-check.vtc +++ b/reg-tests/checks/ssl-hello-check.vtc @@ -22,7 +22,7 @@ syslog S3 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be3/srv failed, reason: Layer6 invalid response.+check duration: [[:digit:]]+ms, status: 0/1 DOWN." } -start -haproxy htst -conf { +haproxy htst -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -46,7 +46,7 @@ haproxy htst -conf { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/tcp-check-ssl.vtc b/reg-tests/checks/tcp-check-ssl.vtc index 4020f73f5..7d23b6114 100644 --- a/reg-tests/checks/tcp-check-ssl.vtc +++ b/reg-tests/checks/tcp-check-ssl.vtc @@ -27,7 +27,7 @@ syslog S4 -level notice { } -start -haproxy htst -conf { +haproxy htst -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -62,7 +62,7 @@ haproxy htst -conf { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/tcp-check_min-recv.vtc b/reg-tests/checks/tcp-check_min-recv.vtc index 83f4c6b91..0025de63f 100644 --- a/reg-tests/checks/tcp-check_min-recv.vtc +++ b/reg-tests/checks/tcp-check_min-recv.vtc @@ -29,7 +29,7 @@ server s2 { expect_close } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/tcp-check_multiple_ports.vtc b/reg-tests/checks/tcp-check_multiple_ports.vtc index 356ddf61c..ee27fbd93 100644 --- a/reg-tests/checks/tcp-check_multiple_ports.vtc +++ b/reg-tests/checks/tcp-check_multiple_ports.vtc @@ -18,7 +18,7 @@ syslog S2 -level notice { server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/tcp-checks-socks4.vtc b/reg-tests/checks/tcp-checks-socks4.vtc index 8a730f542..aaf2ce28f 100644 --- a/reg-tests/checks/tcp-checks-socks4.vtc +++ b/reg-tests/checks/tcp-checks-socks4.vtc @@ -29,7 +29,7 @@ syslog S1 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be1/srv succeeded, reason: Layer7 check passed.+code: 200.+check duration: [[:digit:]]+ms, status: 1/1 UP." } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/checks/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc index 9c3039f53..7d05193d5 100644 --- a/reg-tests/checks/tls_health_checks.vtc +++ b/reg-tests/checks/tls_health_checks.vtc @@ -32,7 +32,7 @@ syslog S1 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* fe1~ be1/srv1 .* 200 [[:digit:]]+ - - ---- .* \"OPTIONS \\* HTTP/1.1\"" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -83,7 +83,7 @@ syslog S6 -level notice { expect ~ "[^:\\[ ]\\[${h2_pid}\\]: Health check for server be6/srv3 succeeded, reason: Layer7 check passed.+code: 200.+check duration: [[:digit:]]+ms, status: 1/1 UP." } -start -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/compression/basic.vtc b/reg-tests/compression/basic.vtc index 5d9eadabd..5b1f3e876 100644 --- a/reg-tests/compression/basic.vtc +++ b/reg-tests/compression/basic.vtc @@ -176,7 +176,7 @@ server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/compression/etags_conversion.vtc b/reg-tests/compression/etags_conversion.vtc index 96e34bcf9..aef3c7808 100644 --- a/reg-tests/compression/etags_conversion.vtc +++ b/reg-tests/compression/etags_conversion.vtc @@ -104,7 +104,7 @@ server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/compression/lua_validation.vtc b/reg-tests/compression/lua_validation.vtc index 817820ae1..beeb8e48a 100644 --- a/reg-tests/compression/lua_validation.vtc +++ b/reg-tests/compression/lua_validation.vtc @@ -6,7 +6,7 @@ varnishtest "Compression validation" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/lua_validation.lua diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc index 489de30f6..955585888 100644 --- a/reg-tests/compression/vary.vtc +++ b/reg-tests/compression/vary.vtc @@ -109,7 +109,7 @@ server s2 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/connection/cli_src_dst.vtc b/reg-tests/connection/cli_src_dst.vtc index 6809d3948..2c8cfc1bd 100644 --- a/reg-tests/connection/cli_src_dst.vtc +++ b/reg-tests/connection/cli_src_dst.vtc @@ -3,7 +3,7 @@ varnishtest "Test multi-level client source and destination addresses" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/connection/dispatch.vtc b/reg-tests/connection/dispatch.vtc index 8696b506e..a25d82361 100644 --- a/reg-tests/connection/dispatch.vtc +++ b/reg-tests/connection/dispatch.vtc @@ -11,7 +11,7 @@ server s2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults log global timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/connection/h2_glitches.vtc b/reg-tests/connection/h2_glitches.vtc index 2bf542f04..73d3c6a5f 100644 --- a/reg-tests/connection/h2_glitches.vtc +++ b/reg-tests/connection/h2_glitches.vtc @@ -5,7 +5,7 @@ varnishtest "h2 glitches" feature ignore_unknown_macro # haproxy frontend -haproxy hap -conf { +haproxy hap -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/http_reuse_aggressive.vtc b/reg-tests/connection/http_reuse_aggressive.vtc index 571a97412..817d84373 100644 --- a/reg-tests/connection/http_reuse_aggressive.vtc +++ b/reg-tests/connection/http_reuse_aggressive.vtc @@ -2,7 +2,7 @@ varnishtest "Test the http-reuse aggressive mode" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/http_reuse_always.vtc b/reg-tests/connection/http_reuse_always.vtc index 8931a0342..58968454a 100644 --- a/reg-tests/connection/http_reuse_always.vtc +++ b/reg-tests/connection/http_reuse_always.vtc @@ -2,7 +2,7 @@ varnishtest "Test the http-reuse always mode" feature ignore_unknown_macro -haproxy h1 -W -conf { +haproxy h1 -W -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/http_reuse_be_transparent.vtc b/reg-tests/connection/http_reuse_be_transparent.vtc index f83511c61..91a72556a 100644 --- a/reg-tests/connection/http_reuse_be_transparent.vtc +++ b/reg-tests/connection/http_reuse_be_transparent.vtc @@ -9,7 +9,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'feature(TPROXY)'" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/http_reuse_conn_hash.vtc b/reg-tests/connection/http_reuse_conn_hash.vtc index 82d46042b..8a3142152 100644 --- a/reg-tests/connection/http_reuse_conn_hash.vtc +++ b/reg-tests/connection/http_reuse_conn_hash.vtc @@ -4,7 +4,7 @@ varnishtest "Test the http-reuse with special connection parameters" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/http_reuse_dispatch.vtc b/reg-tests/connection/http_reuse_dispatch.vtc index ae6dd769f..fa563de92 100644 --- a/reg-tests/connection/http_reuse_dispatch.vtc +++ b/reg-tests/connection/http_reuse_dispatch.vtc @@ -8,7 +8,7 @@ varnishtest "Test the proper interaction between http-reuse and dispatch mode" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/http_reuse_never.vtc b/reg-tests/connection/http_reuse_never.vtc index d04bdfe59..c24c402f1 100644 --- a/reg-tests/connection/http_reuse_never.vtc +++ b/reg-tests/connection/http_reuse_never.vtc @@ -2,7 +2,7 @@ varnishtest "Test the http-reuse never mode" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/http_reuse_safe.vtc b/reg-tests/connection/http_reuse_safe.vtc index c554694ab..c8f69bf8e 100644 --- a/reg-tests/connection/http_reuse_safe.vtc +++ b/reg-tests/connection/http_reuse_safe.vtc @@ -2,7 +2,7 @@ varnishtest "Test the http-reuse safe mode" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/proxy_protocol_random_fail.vtc b/reg-tests/connection/proxy_protocol_random_fail.vtc index 93667decf..e1922960f 100644 --- a/reg-tests/connection/proxy_protocol_random_fail.vtc +++ b/reg-tests/connection/proxy_protocol_random_fail.vtc @@ -22,7 +22,7 @@ syslog Slog_1 -repeat 8 -level info { expect ~ "ssl-offload-http/http .* \"POST (https://.*:${h1_ssl_port})?/[1-8] HTTP/(2\\.0|1\\.1)\"" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/connection/proxy_protocol_send_generic.vtc b/reg-tests/connection/proxy_protocol_send_generic.vtc index af42dd342..d51f9226e 100644 --- a/reg-tests/connection/proxy_protocol_send_generic.vtc +++ b/reg-tests/connection/proxy_protocol_send_generic.vtc @@ -2,7 +2,7 @@ varnishtest "Check that generic TLV IDs are sent properly" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http log global @@ -41,7 +41,7 @@ client c1 -connect ${h1_feS_sock} { } -run # Ensure that we achieve the same via a default-server. -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { defaults mode http log global diff --git a/reg-tests/connection/proxy_protocol_send_unique_id.vtc b/reg-tests/connection/proxy_protocol_send_unique_id.vtc index b020ae850..502a0e796 100644 --- a/reg-tests/connection/proxy_protocol_send_unique_id.vtc +++ b/reg-tests/connection/proxy_protocol_send_unique_id.vtc @@ -2,7 +2,7 @@ varnishtest "Check that the unique ID TLV is properly sent" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc b/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc index 7ea30a5a2..6a46f84bf 100644 --- a/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc +++ b/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc @@ -4,7 +4,7 @@ varnishtest "Check that the unique ID TLV is properly sent for servers with ALPN feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/connection/proxy_protocol_tlv_validation.vtc b/reg-tests/connection/proxy_protocol_tlv_validation.vtc index 8c7d734ed..0294603b0 100644 --- a/reg-tests/connection/proxy_protocol_tlv_validation.vtc +++ b/reg-tests/connection/proxy_protocol_tlv_validation.vtc @@ -7,7 +7,7 @@ feature ignore_unknown_macro # We need one HAProxy for each test, because apparently the connection by # the client is reused, leading to connection resets. -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -40,7 +40,7 @@ client c1 -connect ${h1_fe1_sock} { expect resp.http.echo == "3132333435" } -run -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -77,7 +77,7 @@ client c2 -connect ${h2_fe1_sock} { expect resp.http.echo == } -run -haproxy h3 -conf { +haproxy h3 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -109,7 +109,7 @@ client c3 -connect ${h3_fe1_sock} { expect_close } -run -haproxy h4 -conf { +haproxy h4 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/connection/reverse_connect_full.vtc b/reg-tests/connection/reverse_connect_full.vtc index cc88382ce..2ff6cdff2 100644 --- a/reg-tests/connection/reverse_connect_full.vtc +++ b/reg-tests/connection/reverse_connect_full.vtc @@ -8,7 +8,7 @@ server s1 { txresp } -start -haproxy h_edge -conf { +haproxy h_edge -arg '-dW' -conf { global expose-experimental-directives @@ -31,7 +31,7 @@ backend be-reverse server dev rhttp@ } -start -haproxy h_dev -conf { +haproxy h_dev -arg '-dW' -conf { global expose-experimental-directives diff --git a/reg-tests/connection/reverse_server.vtc b/reg-tests/connection/reverse_server.vtc index 5cd77ca7b..65aca8d30 100644 --- a/reg-tests/connection/reverse_server.vtc +++ b/reg-tests/connection/reverse_server.vtc @@ -5,7 +5,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.9-dev0)'" barrier b1 cond 2 -haproxy h_edge -conf { +haproxy h_edge -arg '-dW' -conf { global expose-experimental-directives diff --git a/reg-tests/connection/reverse_server_name.vtc b/reg-tests/connection/reverse_server_name.vtc index 3a2460174..3508934e6 100644 --- a/reg-tests/connection/reverse_server_name.vtc +++ b/reg-tests/connection/reverse_server_name.vtc @@ -6,7 +6,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.9-dev0)'" barrier b1 cond 2 -haproxy h_edge -conf { +haproxy h_edge -arg '-dW' -conf { global expose-experimental-directives @@ -31,7 +31,7 @@ frontend priv # Simple clear <-> SSL bridge between clients and h_edge haproxy # Used certificate has the name "client1" -haproxy h_ssl_bridge -conf { +haproxy h_ssl_bridge -arg '-dW' -conf { defaults log global timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/connection/tcp_to_http_upgrade.vtc b/reg-tests/connection/tcp_to_http_upgrade.vtc index 39cedd3d5..a948e6b2d 100644 --- a/reg-tests/connection/tcp_to_http_upgrade.vtc +++ b/reg-tests/connection/tcp_to_http_upgrade.vtc @@ -43,7 +43,7 @@ server s1 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/contrib/prometheus.vtc b/reg-tests/contrib/prometheus.vtc index 89d65d7b7..359f1834d 100644 --- a/reg-tests/contrib/prometheus.vtc +++ b/reg-tests/contrib/prometheus.vtc @@ -15,7 +15,7 @@ server s2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/add_item.vtc b/reg-tests/converter/add_item.vtc index 474ad7bf8..b1716ad3a 100644 --- a/reg-tests/converter/add_item.vtc +++ b/reg-tests/converter/add_item.vtc @@ -8,7 +8,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 3 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/be2dec.vtc b/reg-tests/converter/be2dec.vtc index a0b71046b..2a169e761 100644 --- a/reg-tests/converter/be2dec.vtc +++ b/reg-tests/converter/be2dec.vtc @@ -8,7 +8,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 3 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/be2hex.vtc b/reg-tests/converter/be2hex.vtc index 4cf3dc1df..2b378e03a 100644 --- a/reg-tests/converter/be2hex.vtc +++ b/reg-tests/converter/be2hex.vtc @@ -8,7 +8,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 3 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/bytes.vtc b/reg-tests/converter/bytes.vtc index 8abe401e5..b8e43bd84 100644 --- a/reg-tests/converter/bytes.vtc +++ b/reg-tests/converter/bytes.vtc @@ -10,7 +10,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 1 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -97,7 +97,7 @@ client c1 -connect ${h1_fe_sock} { # TEST - 2 # negative starting index causes startup failure -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -117,7 +117,7 @@ haproxy h2 -conf { # TEST - 3 # negative length causes startup failure -haproxy h3 -conf { +haproxy h3 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -137,7 +137,7 @@ haproxy h3 -conf { # TEST - 4 # 0 length causes startup failure -haproxy h4 -conf { +haproxy h4 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/digest.vtc b/reg-tests/converter/digest.vtc index fff0ae398..6e0e56384 100644 --- a/reg-tests/converter/digest.vtc +++ b/reg-tests/converter/digest.vtc @@ -9,7 +9,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/field.vtc b/reg-tests/converter/field.vtc index 3b1d8198e..59bb8837d 100644 --- a/reg-tests/converter/field.vtc +++ b/reg-tests/converter/field.vtc @@ -7,7 +7,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 3 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/fix.vtc b/reg-tests/converter/fix.vtc index 8206da355..aaad3e382 100644 --- a/reg-tests/converter/fix.vtc +++ b/reg-tests/converter/fix.vtc @@ -53,7 +53,7 @@ server s2 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/hmac.vtc b/reg-tests/converter/hmac.vtc index 13729f650..ec30f7c9a 100644 --- a/reg-tests/converter/hmac.vtc +++ b/reg-tests/converter/hmac.vtc @@ -9,7 +9,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/iif.vtc b/reg-tests/converter/iif.vtc index f412daf5c..0dda7b607 100644 --- a/reg-tests/converter/iif.vtc +++ b/reg-tests/converter/iif.vtc @@ -8,7 +8,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 3 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/json.vtc b/reg-tests/converter/json.vtc index 1f37c9f1f..1941fa3bd 100644 --- a/reg-tests/converter/json.vtc +++ b/reg-tests/converter/json.vtc @@ -8,7 +8,7 @@ server s1 { txresp } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/json_query.vtc b/reg-tests/converter/json_query.vtc index f4e3bb203..7e5e93047 100644 --- a/reg-tests/converter/json_query.vtc +++ b/reg-tests/converter/json_query.vtc @@ -8,7 +8,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 8 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/converter/mqtt.vtc b/reg-tests/converter/mqtt.vtc index fc3dacae1..93956a8f4 100644 --- a/reg-tests/converter/mqtt.vtc +++ b/reg-tests/converter/mqtt.vtc @@ -55,7 +55,7 @@ server s2 { sendhex "20250000221100000078217fff24012501270000ffff22000a2600016100016226000163000164" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode tcp timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/param.vtc b/reg-tests/converter/param.vtc index 163360382..6e1ff62a2 100644 --- a/reg-tests/converter/param.vtc +++ b/reg-tests/converter/param.vtc @@ -7,7 +7,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 10 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/secure_memcmp.vtc b/reg-tests/converter/secure_memcmp.vtc index dfda40ec3..40ea1d7ae 100644 --- a/reg-tests/converter/secure_memcmp.vtc +++ b/reg-tests/converter/secure_memcmp.vtc @@ -14,7 +14,7 @@ server s2 { txresp -hdr "Connection: close" } -repeat 7 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/converter/sha2.vtc b/reg-tests/converter/sha2.vtc index b10e45e54..81f5e7d7a 100644 --- a/reg-tests/converter/sha2.vtc +++ b/reg-tests/converter/sha2.vtc @@ -9,7 +9,7 @@ server s1 { txresp } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/url_dec.vtc b/reg-tests/converter/url_dec.vtc index d5e317bb2..67a638454 100644 --- a/reg-tests/converter/url_dec.vtc +++ b/reg-tests/converter/url_dec.vtc @@ -8,7 +8,7 @@ server s1 { txresp } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/url_enc.vtc b/reg-tests/converter/url_enc.vtc index 74acac8ff..e9b57082c 100644 --- a/reg-tests/converter/url_enc.vtc +++ b/reg-tests/converter/url_enc.vtc @@ -9,7 +9,7 @@ server s1 { txresp } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/converter/word.vtc b/reg-tests/converter/word.vtc index acd46781f..2659c901f 100644 --- a/reg-tests/converter/word.vtc +++ b/reg-tests/converter/word.vtc @@ -7,7 +7,7 @@ server s1 { txresp -hdr "Connection: close" } -repeat 3 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/filters/random-forwarding.vtc b/reg-tests/filters/random-forwarding.vtc index abb2bccfa..3cdc20d46 100644 --- a/reg-tests/filters/random-forwarding.vtc +++ b/reg-tests/filters/random-forwarding.vtc @@ -48,7 +48,7 @@ server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-capture/multiple_headers.vtc b/reg-tests/http-capture/multiple_headers.vtc index 1ae210b65..58e8befa1 100644 --- a/reg-tests/http-capture/multiple_headers.vtc +++ b/reg-tests/http-capture/multiple_headers.vtc @@ -38,7 +38,7 @@ server s { -bodylen 16384 } -start -haproxy h -conf { +haproxy h -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-cookies/cookie_insert_indirect.vtc b/reg-tests/http-cookies/cookie_insert_indirect.vtc index 6b86360ad..692fa2ae4 100644 --- a/reg-tests/http-cookies/cookie_insert_indirect.vtc +++ b/reg-tests/http-cookies/cookie_insert_indirect.vtc @@ -21,7 +21,7 @@ server s1 { txresp -hdr "Cookie: SRVID=S1" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global log ${S1_addr}:${S1_port} len 2048 local0 debug err diff --git a/reg-tests/http-cookies/h2_cookie_concat.vtc b/reg-tests/http-cookies/h2_cookie_concat.vtc index f5ae9b973..053b978ad 100644 --- a/reg-tests/http-cookies/h2_cookie_concat.vtc +++ b/reg-tests/http-cookies/h2_cookie_concat.vtc @@ -7,7 +7,7 @@ server s1 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/http-errorfiles/errorfiles.vtc b/reg-tests/http-errorfiles/errorfiles.vtc index 1ace744fa..54621f8b6 100644 --- a/reg-tests/http-errorfiles/errorfiles.vtc +++ b/reg-tests/http-errorfiles/errorfiles.vtc @@ -6,7 +6,7 @@ varnishtest "Test the errofile directive in proxy sections" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-errorfiles/http-error.vtc b/reg-tests/http-errorfiles/http-error.vtc index 6d82f2828..7053b36a3 100644 --- a/reg-tests/http-errorfiles/http-error.vtc +++ b/reg-tests/http-errorfiles/http-error.vtc @@ -4,7 +4,7 @@ varnishtest "Test the http-error directive" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { http-errors errors-1 errorfile 400 ${testdir}/errors/400-1.http errorfile 403 ${testdir}/errors/403-1.http diff --git a/reg-tests/http-errorfiles/http_deny_errors.vtc b/reg-tests/http-errorfiles/http_deny_errors.vtc index befec708e..290fa6b82 100644 --- a/reg-tests/http-errorfiles/http_deny_errors.vtc +++ b/reg-tests/http-errorfiles/http_deny_errors.vtc @@ -4,7 +4,7 @@ varnishtest "Test the custom errors for HTTP deny rules" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { http-errors errors-1 errorfile 400 ${testdir}/errors/400-1.http errorfile 403 ${testdir}/errors/403-1.http diff --git a/reg-tests/http-errorfiles/http_errors.vtc b/reg-tests/http-errorfiles/http_errors.vtc index 4bc227674..2f6e7d6ba 100644 --- a/reg-tests/http-errorfiles/http_errors.vtc +++ b/reg-tests/http-errorfiles/http_errors.vtc @@ -4,7 +4,7 @@ varnishtest "Test the errorfiles directive" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { http-errors errors-1 errorfile 400 ${testdir}/errors/400-1.http errorfile 403 ${testdir}/errors/403-1.http diff --git a/reg-tests/http-errorfiles/http_return.vtc b/reg-tests/http-errorfiles/http_return.vtc index b7750501c..74e8563f0 100644 --- a/reg-tests/http-errorfiles/http_return.vtc +++ b/reg-tests/http-errorfiles/http_return.vtc @@ -5,7 +5,7 @@ varnishtest "Test the HTTP return action with errorfiles" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { http-errors errors-2 errorfile 400 ${testdir}/errors/400-2.http diff --git a/reg-tests/http-messaging/h1_host_normalization.vtc b/reg-tests/http-messaging/h1_host_normalization.vtc index 909d52509..4efb655dd 100644 --- a/reg-tests/http-messaging/h1_host_normalization.vtc +++ b/reg-tests/http-messaging/h1_host_normalization.vtc @@ -234,7 +234,7 @@ syslog S1 -level info { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-messaging/h1_request_target_validation.vtc b/reg-tests/http-messaging/h1_request_target_validation.vtc index 63e194ae3..768dfb841 100644 --- a/reg-tests/http-messaging/h1_request_target_validation.vtc +++ b/reg-tests/http-messaging/h1_request_target_validation.vtc @@ -4,7 +4,7 @@ feature ignore_unknown_macro #REQUIRE_VERSION=3.0 -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-messaging/h1_to_h1.vtc b/reg-tests/http-messaging/h1_to_h1.vtc index 67aba1440..10c059476 100644 --- a/reg-tests/http-messaging/h1_to_h1.vtc +++ b/reg-tests/http-messaging/h1_to_h1.vtc @@ -113,7 +113,7 @@ server s1 { -body "response 4" } -repeat 3 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-messaging/h2_desync_attacks.vtc b/reg-tests/http-messaging/h2_desync_attacks.vtc index c638f7d5b..7e17972e6 100644 --- a/reg-tests/http-messaging/h2_desync_attacks.vtc +++ b/reg-tests/http-messaging/h2_desync_attacks.vtc @@ -13,7 +13,7 @@ server s1 { } -start # haproxy frontend -haproxy hap -conf { +haproxy hap -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/http-messaging/h2_to_h1.vtc b/reg-tests/http-messaging/h2_to_h1.vtc index 637b66486..407140211 100644 --- a/reg-tests/http-messaging/h2_to_h1.vtc +++ b/reg-tests/http-messaging/h2_to_h1.vtc @@ -40,7 +40,7 @@ server s1 { # the next request is never received } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-messaging/http_abortonclose.vtc b/reg-tests/http-messaging/http_abortonclose.vtc index ea57f3d6b..6a52b9da4 100644 --- a/reg-tests/http-messaging/http_abortonclose.vtc +++ b/reg-tests/http-messaging/http_abortonclose.vtc @@ -63,7 +63,7 @@ syslog S2 -level info { expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe2 be2/srv1 [0-9]*/[0-9]*/-1/-1/[0-9]* 503 .* - - SC-- .* .* \"GET /c6 HTTP/1\\.1\"" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring @@ -109,7 +109,7 @@ haproxy h1 -conf { } -start -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-messaging/http_bodyless_response.vtc b/reg-tests/http-messaging/http_bodyless_response.vtc index 6b53bc4f4..9ecb078ff 100644 --- a/reg-tests/http-messaging/http_bodyless_response.vtc +++ b/reg-tests/http-messaging/http_bodyless_response.vtc @@ -30,7 +30,7 @@ server s1 { -body "last response" } -repeat 3 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-messaging/http_bodyless_spliced_response.vtc b/reg-tests/http-messaging/http_bodyless_spliced_response.vtc index 73916f224..177d0c249 100644 --- a/reg-tests/http-messaging/http_bodyless_spliced_response.vtc +++ b/reg-tests/http-messaging/http_bodyless_spliced_response.vtc @@ -34,7 +34,7 @@ server s1 { -body "last response" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-messaging/http_msg_full_on_eom.vtc b/reg-tests/http-messaging/http_msg_full_on_eom.vtc index f02666f1f..603f8ab90 100644 --- a/reg-tests/http-messaging/http_msg_full_on_eom.vtc +++ b/reg-tests/http-messaging/http_msg_full_on_eom.vtc @@ -21,7 +21,7 @@ syslog S -level info { expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe1 be1/srv1 [0-9]*/[0-9]*/[0-9]*/[0-9]*/[0-9]* 200 .* - - ---- .* .* \"GET / HTTP/1\\.1\"" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global tune.bufsize 16384 tune.maxrewrite 1024 diff --git a/reg-tests/http-messaging/http_request_buffer.vtc b/reg-tests/http-messaging/http_request_buffer.vtc index 302db4ab4..5a7057748 100644 --- a/reg-tests/http-messaging/http_request_buffer.vtc +++ b/reg-tests/http-messaging/http_request_buffer.vtc @@ -39,7 +39,7 @@ syslog S -level info { expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe2 be1/ [0-9]*/-1/-1/-1/[0-9]* 400 .* - - CR-- .* .* \"POST /2 HTTP/1\\.1\"" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout client 100 diff --git a/reg-tests/http-messaging/http_splicing.vtc b/reg-tests/http-messaging/http_splicing.vtc index e86680bd5..bed212349 100644 --- a/reg-tests/http-messaging/http_splicing.vtc +++ b/reg-tests/http-messaging/http_splicing.vtc @@ -22,7 +22,7 @@ server s2 { txresp -status 200 -nolen -bodylen 1048576 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global log stderr len 4096 local0 debug diff --git a/reg-tests/http-messaging/http_splicing_chunk.vtc b/reg-tests/http-messaging/http_splicing_chunk.vtc index e2e9f32dd..d0333e379 100644 --- a/reg-tests/http-messaging/http_splicing_chunk.vtc +++ b/reg-tests/http-messaging/http_splicing_chunk.vtc @@ -26,7 +26,7 @@ server s1 { chunkedlen 0 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global log stderr len 4096 local0 debug diff --git a/reg-tests/http-messaging/http_transfer_encoding.vtc b/reg-tests/http-messaging/http_transfer_encoding.vtc index 322dfe29a..26532fe17 100644 --- a/reg-tests/http-messaging/http_transfer_encoding.vtc +++ b/reg-tests/http-messaging/http_transfer_encoding.vtc @@ -76,7 +76,7 @@ server s2 { -hdr "Transfer-Encoding: gzip" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-messaging/http_wait_for_body.vtc b/reg-tests/http-messaging/http_wait_for_body.vtc index a9f819117..01110db6f 100644 --- a/reg-tests/http-messaging/http_wait_for_body.vtc +++ b/reg-tests/http-messaging/http_wait_for_body.vtc @@ -69,7 +69,7 @@ server s2 { send "1" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-messaging/protocol_upgrade.vtc b/reg-tests/http-messaging/protocol_upgrade.vtc index 46c98481b..ba49fcc0e 100644 --- a/reg-tests/http-messaging/protocol_upgrade.vtc +++ b/reg-tests/http-messaging/protocol_upgrade.vtc @@ -139,7 +139,7 @@ server srv_h1_h2c { -status 200 } -start -haproxy hap -conf { +haproxy hap -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-messaging/scheme_based_normalize.vtc b/reg-tests/http-messaging/scheme_based_normalize.vtc index 3edbafbd1..3a8c1586d 100644 --- a/reg-tests/http-messaging/scheme_based_normalize.vtc +++ b/reg-tests/http-messaging/scheme_based_normalize.vtc @@ -17,7 +17,7 @@ syslog S1 -level info { expect ~ "^.* uri: GET https://hostname:80/ HTTP/2.0; host: {hostname:80}$" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-messaging/srv_ws.vtc b/reg-tests/http-messaging/srv_ws.vtc index 996981333..feae4a486 100644 --- a/reg-tests/http-messaging/srv_ws.vtc +++ b/reg-tests/http-messaging/srv_ws.vtc @@ -8,7 +8,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && !ssllib_name_startswith(w feature ignore_unknown_macro # haproxy server -haproxy hapsrv -conf { +haproxy hapsrv -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -37,7 +37,7 @@ haproxy hapsrv -conf { } -start # haproxy LB -haproxy hap -conf { +haproxy hap -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-messaging/truncated.vtc b/reg-tests/http-messaging/truncated.vtc index e674b8726..bd364de04 100644 --- a/reg-tests/http-messaging/truncated.vtc +++ b/reg-tests/http-messaging/truncated.vtc @@ -59,7 +59,7 @@ server s1 { delay 0.05 } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults #log stdout format raw daemon mode http diff --git a/reg-tests/http-messaging/websocket.vtc b/reg-tests/http-messaging/websocket.vtc index aed55fe51..44c89cecc 100644 --- a/reg-tests/http-messaging/websocket.vtc +++ b/reg-tests/http-messaging/websocket.vtc @@ -47,7 +47,7 @@ server s2 { # haproxy instance used as a server # generate a http/1.1 websocket response with the valid key -haproxy hap_srv -conf { +haproxy hap_srv -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -69,7 +69,7 @@ haproxy hap_srv -conf { # haproxy instance used as a server # generate a http/1.1 websocket response with an invalid key -haproxy hap_srv_bad_key -conf { +haproxy hap_srv_bad_key -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -89,7 +89,7 @@ haproxy hap_srv_bad_key -conf { http-after-response set-status 101 if { status eq 200 } } -start -haproxy hap -conf { +haproxy hap -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/acl_cli_spaces.vtc b/reg-tests/http-rules/acl_cli_spaces.vtc index 81b7b0dcf..82829a15f 100644 --- a/reg-tests/http-rules/acl_cli_spaces.vtc +++ b/reg-tests/http-rules/acl_cli_spaces.vtc @@ -7,7 +7,7 @@ server s1 { txresp } -repeat 2 -start -haproxy h1 -W -S -conf { +haproxy h1 -W -S -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc index f19b7c148..c250a5061 100644 --- a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc +++ b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc @@ -72,7 +72,7 @@ server s2 { # ipmask,hdr_ip tests with accept-proxy bind -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -131,7 +131,7 @@ haproxy h1 -conf { } -start # concat,strcmp,word,field haproxy -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/default_rules.vtc b/reg-tests/http-rules/default_rules.vtc index cc726ab08..1e3553569 100644 --- a/reg-tests/http-rules/default_rules.vtc +++ b/reg-tests/http-rules/default_rules.vtc @@ -17,7 +17,7 @@ server s2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults common mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -57,7 +57,7 @@ haproxy h1 -conf { } -start -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { defaults common mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -92,7 +92,7 @@ haproxy h2 -conf { } -start -haproxy h3 -conf { +haproxy h3 -arg '-dW' -conf { defaults base-http mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/del_header.vtc b/reg-tests/http-rules/del_header.vtc index 0f74a606e..964adf598 100644 --- a/reg-tests/http-rules/del_header.vtc +++ b/reg-tests/http-rules/del_header.vtc @@ -33,7 +33,7 @@ server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/except-forwardfor-originalto.vtc b/reg-tests/http-rules/except-forwardfor-originalto.vtc index a85916042..e1834190a 100644 --- a/reg-tests/http-rules/except-forwardfor-originalto.vtc +++ b/reg-tests/http-rules/except-forwardfor-originalto.vtc @@ -6,7 +6,7 @@ varnishtest "Test IPv4/IPv6 except param for the forwardfor and originalto optio feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-rules/forwarded-header-7239.vtc b/reg-tests/http-rules/forwarded-header-7239.vtc index dd2c6e3fd..11b34f2cd 100644 --- a/reg-tests/http-rules/forwarded-header-7239.vtc +++ b/reg-tests/http-rules/forwarded-header-7239.vtc @@ -6,7 +6,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.8-dev0)'" feature ignore_unknown_macro #test: converters, parsing and header injection logic -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring @@ -53,7 +53,7 @@ haproxy h1 -conf { } -start #test: "default" and "no option forwarded" -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-rules/h1or2_to_h1c.vtc b/reg-tests/http-rules/h1or2_to_h1c.vtc index 89ae0f6a6..a9b1e2d27 100644 --- a/reg-tests/http-rules/h1or2_to_h1c.vtc +++ b/reg-tests/http-rules/h1or2_to_h1c.vtc @@ -34,7 +34,7 @@ server s1 { expect req.http.be-hdr-crc == 3634102538 } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/http-err-fail.vtc b/reg-tests/http-rules/http-err-fail.vtc index 6d8f9ea3e..a7ba71741 100644 --- a/reg-tests/http-rules/http-err-fail.vtc +++ b/reg-tests/http-rules/http-err-fail.vtc @@ -24,7 +24,7 @@ server s5 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global http-err-codes 220 +300-499 -300-399 # only 220, 400-499 remain http-fail-codes -550-580 +555,599,556-566 diff --git a/reg-tests/http-rules/http_after_response.vtc b/reg-tests/http-rules/http_after_response.vtc index 871cc2773..90e8afaf9 100644 --- a/reg-tests/http-rules/http_after_response.vtc +++ b/reg-tests/http-rules/http_after_response.vtc @@ -18,7 +18,7 @@ server s1 { -body "This is a body" } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/http_return.vtc b/reg-tests/http-rules/http_return.vtc index ea4e95672..91ba4e55d 100644 --- a/reg-tests/http-rules/http_return.vtc +++ b/reg-tests/http-rules/http_return.vtc @@ -4,7 +4,7 @@ varnishtest "Test the HTTP return action" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-rules/ifnone-forwardfor.vtc b/reg-tests/http-rules/ifnone-forwardfor.vtc index a743b10b4..de4d35451 100644 --- a/reg-tests/http-rules/ifnone-forwardfor.vtc +++ b/reg-tests/http-rules/ifnone-forwardfor.vtc @@ -5,7 +5,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.6-dev0)'" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-rules/map_ordering.vtc b/reg-tests/http-rules/map_ordering.vtc index 923d19fa5..ee0633045 100644 --- a/reg-tests/http-rules/map_ordering.vtc +++ b/reg-tests/http-rules/map_ordering.vtc @@ -2,7 +2,7 @@ varnishtest "Ensure mapfile ordering is preserved when loading the file" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/map_redirect.vtc b/reg-tests/http-rules/map_redirect.vtc index e8ed03363..b00b1361e 100644 --- a/reg-tests/http-rules/map_redirect.vtc +++ b/reg-tests/http-rules/map_redirect.vtc @@ -31,7 +31,7 @@ server s4 { txresp -body "test1 after del map ok" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http log global diff --git a/reg-tests/http-rules/map_regm_with_backref.vtc b/reg-tests/http-rules/map_regm_with_backref.vtc index c3b21fbde..e1e6ba66e 100644 --- a/reg-tests/http-rules/map_regm_with_backref.vtc +++ b/reg-tests/http-rules/map_regm_with_backref.vtc @@ -32,7 +32,7 @@ server s1 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global log ${S1_addr}:${S1_port} local0 debug err diff --git a/reg-tests/http-rules/normalize_uri.vtc b/reg-tests/http-rules/normalize_uri.vtc index 0a9063050..31481aa77 100644 --- a/reg-tests/http-rules/normalize_uri.vtc +++ b/reg-tests/http-rules/normalize_uri.vtc @@ -10,7 +10,7 @@ server s1 { txresp -hdr "connection: close" } -repeat 70 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/http-rules/path_and_pathq.vtc b/reg-tests/http-rules/path_and_pathq.vtc index 971cbe2d5..06d6303ea 100644 --- a/reg-tests/http-rules/path_and_pathq.vtc +++ b/reg-tests/http-rules/path_and_pathq.vtc @@ -24,7 +24,7 @@ server s1 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/restrict_req_hdr_names.vtc b/reg-tests/http-rules/restrict_req_hdr_names.vtc index 4b26e33c6..80832609b 100644 --- a/reg-tests/http-rules/restrict_req_hdr_names.vtc +++ b/reg-tests/http-rules/restrict_req_hdr_names.vtc @@ -61,7 +61,7 @@ server s9 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/http-rules/strict_rw_mode.vtc b/reg-tests/http-rules/strict_rw_mode.vtc index 89a4548f7..684324db8 100644 --- a/reg-tests/http-rules/strict_rw_mode.vtc +++ b/reg-tests/http-rules/strict_rw_mode.vtc @@ -60,7 +60,7 @@ server s2 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global tune.bufsize 2048 tune.maxrewrite 128 diff --git a/reg-tests/http-set-timeout/set_timeout.vtc b/reg-tests/http-set-timeout/set_timeout.vtc index a112bc51e..360cb2d86 100644 --- a/reg-tests/http-set-timeout/set_timeout.vtc +++ b/reg-tests/http-set-timeout/set_timeout.vtc @@ -54,7 +54,7 @@ syslog Slog9 -level info { expect ~ "^.*timeout: 5000 3000.*$" } -start -haproxy hap -conf { +haproxy hap -arg '-dW' -conf { defaults timeout connect 5s timeout client 5s diff --git a/reg-tests/jwt/jws_verify.vtc b/reg-tests/jwt/jws_verify.vtc index 57a2ee239..e1bd5578c 100644 --- a/reg-tests/jwt/jws_verify.vtc +++ b/reg-tests/jwt/jws_verify.vtc @@ -21,7 +21,7 @@ server s1 -repeat 24 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/log/last_rule.vtc b/reg-tests/log/last_rule.vtc index f2b89e491..27a4b6e86 100644 --- a/reg-tests/log/last_rule.vtc +++ b/reg-tests/log/last_rule.vtc @@ -45,7 +45,7 @@ syslog Slg_1 -level info { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* lr=.*/h1/cfg:49" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global nbthread 1 diff --git a/reg-tests/log/load_balancing.vtc b/reg-tests/log/load_balancing.vtc index 5c56e653d..6b3299463 100644 --- a/reg-tests/log/load_balancing.vtc +++ b/reg-tests/log/load_balancing.vtc @@ -33,7 +33,7 @@ syslog Slg_2 -level info { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* \"GET /client_c8 HTTP/1.1\"" } -repeat 50 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global nbthread 1 diff --git a/reg-tests/log/log_backend.vtc b/reg-tests/log/log_backend.vtc index a9223ee01..02c5277cc 100644 --- a/reg-tests/log/log_backend.vtc +++ b/reg-tests/log/log_backend.vtc @@ -37,7 +37,7 @@ syslog Slg24 -level info { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* \"GET /backup HTTP/1.1\"" } -repeat 1 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http option httplog diff --git a/reg-tests/log/log_forward.vtc b/reg-tests/log/log_forward.vtc index 3977f4ca5..87e55afb0 100644 --- a/reg-tests/log/log_forward.vtc +++ b/reg-tests/log/log_forward.vtc @@ -12,7 +12,7 @@ syslog Slg1 -level info { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* \"GET /client_c1 HTTP/1.1\"" } -repeat 50 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http option httplog diff --git a/reg-tests/log/log_profiles.vtc b/reg-tests/log/log_profiles.vtc index 0aeb338d4..5e9fe34ce 100644 --- a/reg-tests/log/log_profiles.vtc +++ b/reg-tests/log/log_profiles.vtc @@ -110,7 +110,7 @@ syslog Slg6 -level info { expect ~ ".* haproxy ${h1_pid} .* txn_close" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/log/log_uri.vtc b/reg-tests/log/log_uri.vtc index 6dd50d2fa..0bddfe347 100644 --- a/reg-tests/log/log_uri.vtc +++ b/reg-tests/log/log_uri.vtc @@ -19,7 +19,7 @@ syslog Slg_1 -level info { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* hpo=/r/4 hp=http://localhost/r/4 hu=http://localhost/r/4\\?q=4 hq=\\?q=4" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global nbthread 1 diff --git a/reg-tests/log/wrong_ip_port_logging.vtc b/reg-tests/log/wrong_ip_port_logging.vtc index 44312af9f..914b23fdb 100644 --- a/reg-tests/log/wrong_ip_port_logging.vtc +++ b/reg-tests/log/wrong_ip_port_logging.vtc @@ -33,7 +33,7 @@ syslog Slg_1 -level notice { expect ~ \"dip\":\"${h1_fe_1_addr}\",\"dport\":\"${h1_fe_1_port}.*\"ts\":\"[cC-][D-]\",\" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global log ${Slg_1_addr}:${Slg_1_port} local0 diff --git a/reg-tests/lua/bad_http_clt_req_duration.vtc b/reg-tests/lua/bad_http_clt_req_duration.vtc index 5cfdf1a7e..037a3f5fe 100644 --- a/reg-tests/lua/bad_http_clt_req_duration.vtc +++ b/reg-tests/lua/bad_http_clt_req_duration.vtc @@ -33,7 +33,7 @@ syslog Slog { expect ~ "[^:\\[ ]\\[[0-9]*\\]: Tc=[0-9]* Td=[0-9]* Th=[0-9]* Tt=[0-9]* Tw=[0-9]*$" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/bad_http_clt_req_duration.lua diff --git a/reg-tests/lua/close_wait_lf.vtc b/reg-tests/lua/close_wait_lf.vtc index 7bed3fd8e..73a1b3d46 100644 --- a/reg-tests/lua/close_wait_lf.vtc +++ b/reg-tests/lua/close_wait_lf.vtc @@ -24,7 +24,7 @@ syslog Slog -level info -repeat 100 { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Ta=[0-9]* Tc=[0-9]* Td=[0-9]* Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9]* Tr=[0-9]* Tt=[0-9]* Tw=[0-9]*" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/lua/h_txn_get_priv.vtc b/reg-tests/lua/h_txn_get_priv.vtc index 0a846af59..1680dc9cd 100644 --- a/reg-tests/lua/h_txn_get_priv.vtc +++ b/reg-tests/lua/h_txn_get_priv.vtc @@ -3,7 +3,7 @@ varnishtest "Lua: txn:get_priv() scope" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/h_txn_get_priv.lua diff --git a/reg-tests/lua/httpclient_action.vtc b/reg-tests/lua/httpclient_action.vtc index 11c7d629b..b148bb112 100644 --- a/reg-tests/lua/httpclient_action.vtc +++ b/reg-tests/lua/httpclient_action.vtc @@ -9,7 +9,7 @@ feature ignore_unknown_macro #REQUIRE_OPTIONS=LUA -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/httpclient_action.lua diff --git a/reg-tests/lua/lua_httpclient.vtc b/reg-tests/lua/lua_httpclient.vtc index bf53b5281..bce63308e 100644 --- a/reg-tests/lua/lua_httpclient.vtc +++ b/reg-tests/lua/lua_httpclient.vtc @@ -36,7 +36,7 @@ server s3 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/lua_httpclient.lua diff --git a/reg-tests/lua/lua_socket.vtc b/reg-tests/lua/lua_socket.vtc index 3d0cd1572..a3b1308da 100644 --- a/reg-tests/lua/lua_socket.vtc +++ b/reg-tests/lua/lua_socket.vtc @@ -8,7 +8,7 @@ server s1 { txresp -bodylen 20 } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/lua_socket.lua diff --git a/reg-tests/lua/set_var.vtc b/reg-tests/lua/set_var.vtc index 51b5dfc51..01c0bb1fb 100644 --- a/reg-tests/lua/set_var.vtc +++ b/reg-tests/lua/set_var.vtc @@ -3,7 +3,7 @@ varnishtest "Lua: set_var" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/lua/txn_get_priv-thread.vtc b/reg-tests/lua/txn_get_priv-thread.vtc index 3cf79bdfb..ada62cf10 100644 --- a/reg-tests/lua/txn_get_priv-thread.vtc +++ b/reg-tests/lua/txn_get_priv-thread.vtc @@ -5,7 +5,7 @@ varnishtest "Lua: txn:get_priv() scope" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/lua/txn_get_priv.vtc b/reg-tests/lua/txn_get_priv.vtc index e370d098f..1e83b58cb 100644 --- a/reg-tests/lua/txn_get_priv.vtc +++ b/reg-tests/lua/txn_get_priv.vtc @@ -4,7 +4,7 @@ varnishtest "Lua: txn:get_priv() scope" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/txn_get_priv.lua lua-load ${testdir}/txn_get_priv-print_r.lua diff --git a/reg-tests/lua/wrong_types_usage.vtc b/reg-tests/lua/wrong_types_usage.vtc index 995d42624..efafa11c0 100644 --- a/reg-tests/lua/wrong_types_usage.vtc +++ b/reg-tests/lua/wrong_types_usage.vtc @@ -41,7 +41,7 @@ server s1 -repeat 2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/wrong_types_usage.lua diff --git a/reg-tests/mailers/healthcheckmail.vtc b/reg-tests/mailers/healthcheckmail.vtc index 208d350f6..36f7ecc26 100644 --- a/reg-tests/mailers/healthcheckmail.vtc +++ b/reg-tests/mailers/healthcheckmail.vtc @@ -10,7 +10,7 @@ syslog S1 -level notice { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Result=SUCCESS Bytes=[[:digit:]]+" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global lua-load ${testdir}/mailers.lua lua-load ${testdir}/healthcheckmail.lua diff --git a/reg-tests/mcli/mcli_debug_dev.vtc b/reg-tests/mcli/mcli_debug_dev.vtc index 147ff0dc7..3c6ed6bbc 100644 --- a/reg-tests/mcli/mcli_debug_dev.vtc +++ b/reg-tests/mcli/mcli_debug_dev.vtc @@ -19,7 +19,7 @@ syslog S1 -level info { } -start -haproxy h1 -W -S -conf { +haproxy h1 -W -S -arg '-dW' -conf { global log ${S1_addr}:${S1_port} local0 info diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc index 276488a1b..4d22c367b 100644 --- a/reg-tests/mcli/mcli_show_info.vtc +++ b/reg-tests/mcli/mcli_show_info.vtc @@ -6,7 +6,7 @@ feature ignore_unknown_macro server s1 { } -start -haproxy h1 -W -S -conf { +haproxy h1 -W -S -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/peers/basic_sync.vtc b/reg-tests/peers/basic_sync.vtc index 5c0cb4117..67589cf9d 100644 --- a/reg-tests/peers/basic_sync.vtc +++ b/reg-tests/peers/basic_sync.vtc @@ -3,7 +3,7 @@ feature ignore_unknown_macro #REGTEST_TYPE=slow -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -25,7 +25,7 @@ haproxy h1 -arg "-L A" -conf { tcp-request content sc-inc-gpc0(0) } -haproxy h2 -arg "-L B" -conf { +haproxy h2 -arg "-L B" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -47,7 +47,7 @@ haproxy h2 -arg "-L B" -conf { http-request sc-inc-gpc0(0) } -haproxy h3 -arg "-L C" -conf { +haproxy h3 -arg "-L C" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/peers/basic_sync_wo_stkt_backend.vtc b/reg-tests/peers/basic_sync_wo_stkt_backend.vtc index 9f97ff54e..d2df63f32 100644 --- a/reg-tests/peers/basic_sync_wo_stkt_backend.vtc +++ b/reg-tests/peers/basic_sync_wo_stkt_backend.vtc @@ -3,7 +3,7 @@ feature ignore_unknown_macro #REGTEST_TYPE=slow -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -24,7 +24,7 @@ haproxy h1 -arg "-L A" -conf { tcp-request content sc-inc-gpc0(0) } -haproxy h2 -arg "-L B" -conf { +haproxy h2 -arg "-L B" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -44,7 +44,7 @@ haproxy h2 -arg "-L B" -conf { http-request sc-inc-gpc0(0) } -haproxy h3 -arg "-L C" -conf { +haproxy h3 -arg "-L C" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/peers/tls_basic_sync.vtc b/reg-tests/peers/tls_basic_sync.vtc index 95e3d736e..45023883a 100644 --- a/reg-tests/peers/tls_basic_sync.vtc +++ b/reg-tests/peers/tls_basic_sync.vtc @@ -4,7 +4,7 @@ feature ignore_unknown_macro #REGTEST_TYPE=slow -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -28,7 +28,7 @@ haproxy h1 -arg "-L A" -conf { tcp-request content sc-inc-gpc0(0) } -haproxy h2 -arg "-L B" -conf { +haproxy h2 -arg "-L B" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -52,7 +52,7 @@ haproxy h2 -arg "-L B" -conf { http-request sc-inc-gpc0(0) } -haproxy h3 -arg "-L C" -conf { +haproxy h3 -arg "-L C" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -76,7 +76,7 @@ haproxy h3 -arg "-L C" -conf { http-request sc-inc-gpc0(0) } -haproxy h4 -arg "-L D" -conf { +haproxy h4 -arg "-L D" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc index bf467084b..9f17cd493 100644 --- a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc +++ b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc @@ -4,7 +4,7 @@ feature ignore_unknown_macro #REQUIRE_OPTIONS=OPENSSL #REGTEST_TYPE=slow -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -26,7 +26,7 @@ haproxy h1 -arg "-L A" -conf { tcp-request content sc-inc-gpc0(0) } -haproxy h2 -arg "-L B" -conf { +haproxy h2 -arg "-L B" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -48,7 +48,7 @@ haproxy h2 -arg "-L B" -conf { http-request sc-inc-gpc0(0) } -haproxy h3 -arg "-L C" -conf { +haproxy h3 -arg "-L C" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -70,7 +70,7 @@ haproxy h3 -arg "-L C" -conf { http-request sc-inc-gpc0(0) } -haproxy h4 -arg "-L D" -conf { +haproxy h4 -arg "-L D" -arg '-dW' -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/sample_fetches/acl.vtc b/reg-tests/sample_fetches/acl.vtc index 21e6f4b52..9571da923 100644 --- a/reg-tests/sample_fetches/acl.vtc +++ b/reg-tests/sample_fetches/acl.vtc @@ -3,7 +3,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.9-dev2)'" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/sample_fetches/cond_set_var.vtc b/reg-tests/sample_fetches/cond_set_var.vtc index 82961e100..b370f5846 100644 --- a/reg-tests/sample_fetches/cond_set_var.vtc +++ b/reg-tests/sample_fetches/cond_set_var.vtc @@ -27,7 +27,7 @@ server s1 -repeat 10 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global set-var proc.int12 int(12) set-var proc.int5 var(proc.str60,60),div(proc.int12) diff --git a/reg-tests/sample_fetches/cook.vtc b/reg-tests/sample_fetches/cook.vtc index c1d26ada8..65a526742 100644 --- a/reg-tests/sample_fetches/cook.vtc +++ b/reg-tests/sample_fetches/cook.vtc @@ -9,7 +9,7 @@ server s1 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s @@ -51,7 +51,7 @@ server s2 { txresp -hdr "Set-Cookie: cook1=0; cook2=123; cook3=22" } -start -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s @@ -83,7 +83,7 @@ server s3 { txresp } -start -haproxy h3 -conf { +haproxy h3 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s @@ -118,7 +118,7 @@ server s4 { -hdr "Set-Cookie: cook4=1; cook5=2; cook6=3" } -start -haproxy h4 -conf { +haproxy h4 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/sample_fetches/hashes.vtc b/reg-tests/sample_fetches/hashes.vtc index 2c2f60d93..7eb815c43 100644 --- a/reg-tests/sample_fetches/hashes.vtc +++ b/reg-tests/sample_fetches/hashes.vtc @@ -9,7 +9,7 @@ server s1 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/sample_fetches/so_name.vtc b/reg-tests/sample_fetches/so_name.vtc index eea17b188..4497c0fd1 100644 --- a/reg-tests/sample_fetches/so_name.vtc +++ b/reg-tests/sample_fetches/so_name.vtc @@ -2,7 +2,7 @@ varnishtest "so_name sample fetche Test" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/sample_fetches/srv_name.vtc b/reg-tests/sample_fetches/srv_name.vtc index 08233aac7..c0548e89a 100644 --- a/reg-tests/sample_fetches/srv_name.vtc +++ b/reg-tests/sample_fetches/srv_name.vtc @@ -12,7 +12,7 @@ server s2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/sample_fetches/tcpinfo_rtt.vtc b/reg-tests/sample_fetches/tcpinfo_rtt.vtc index e21c542c0..ecd548b02 100644 --- a/reg-tests/sample_fetches/tcpinfo_rtt.vtc +++ b/reg-tests/sample_fetches/tcpinfo_rtt.vtc @@ -8,7 +8,7 @@ server s1 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults common mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/sample_fetches/tlvs.vtc b/reg-tests/sample_fetches/tlvs.vtc index 9312b1df9..193129c65 100644 --- a/reg-tests/sample_fetches/tlvs.vtc +++ b/reg-tests/sample_fetches/tlvs.vtc @@ -1,7 +1,7 @@ varnishtest "Tests for fetching PROXY protocol v2 TLVs" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/sample_fetches/ubase64.vtc b/reg-tests/sample_fetches/ubase64.vtc index 26fe02e82..0a703cf9a 100644 --- a/reg-tests/sample_fetches/ubase64.vtc +++ b/reg-tests/sample_fetches/ubase64.vtc @@ -4,7 +4,7 @@ varnishtest "ub64dec sample fetche Test" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/reg-tests/sample_fetches/vars.vtc b/reg-tests/sample_fetches/vars.vtc index 29d474cf2..00aed387f 100644 --- a/reg-tests/sample_fetches/vars.vtc +++ b/reg-tests/sample_fetches/vars.vtc @@ -3,7 +3,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev5)'" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # note below, str60 is purposely not defined so that the default is used set-var proc.int12 int(12) diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc index 3686a1f65..807e5da39 100644 --- a/reg-tests/seamless-reload/abns_socket.vtc +++ b/reg-tests/seamless-reload/abns_socket.vtc @@ -23,7 +23,7 @@ feature cmd "command -v grep" #EXCLUDE_TARGETS=freebsd,osx,generic #REGTEST_TYPE=devel -haproxy h1 -W -S -conf { +haproxy h1 -W -S -arg '-dW' -conf { global stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners diff --git a/reg-tests/server/abnsz.vtc b/reg-tests/server/abnsz.vtc index 164d17274..72566a270 100644 --- a/reg-tests/server/abnsz.vtc +++ b/reg-tests/server/abnsz.vtc @@ -6,7 +6,7 @@ feature cmd "command -v curl" #EXCLUDE_TARGETS=freebsd,osx,generic #REGTEST_TYPE=devel -haproxy h1 -W -S -conf { +haproxy h1 -W -S -arg '-dW' -conf { global stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners diff --git a/reg-tests/server/cli_add_check_server.vtc b/reg-tests/server/cli_add_check_server.vtc index e5b26d76b..59fcd90bb 100644 --- a/reg-tests/server/cli_add_check_server.vtc +++ b/reg-tests/server/cli_add_check_server.vtc @@ -62,7 +62,7 @@ syslog S1 -level notice { expect ~ "Health check for server be1/s5 succeeded." } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global stats socket "${tmpdir}/h1/stats" level admin diff --git a/reg-tests/server/cli_add_server.vtc b/reg-tests/server/cli_add_server.vtc index 8c29305e7..c01bd1888 100644 --- a/reg-tests/server/cli_add_server.vtc +++ b/reg-tests/server/cli_add_server.vtc @@ -9,7 +9,7 @@ server s1 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/server/cli_add_ssl_server.vtc b/reg-tests/server/cli_add_ssl_server.vtc index 48faee13c..732ee4e2e 100644 --- a/reg-tests/server/cli_add_ssl_server.vtc +++ b/reg-tests/server/cli_add_ssl_server.vtc @@ -23,7 +23,7 @@ syslog S1 -level notice { expect ~ "Health check for server li-ssl/s3 succeeded." } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global stats socket "${tmpdir}/h1/stats" level admin diff --git a/reg-tests/server/cli_add_track_server.vtc b/reg-tests/server/cli_add_track_server.vtc index 2377fb2e4..694aec301 100644 --- a/reg-tests/server/cli_add_track_server.vtc +++ b/reg-tests/server/cli_add_track_server.vtc @@ -89,7 +89,7 @@ syslog S3 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global stats socket "${tmpdir}/h1/stats" level admin diff --git a/reg-tests/server/cli_delete_dynamic_server.vtc b/reg-tests/server/cli_delete_dynamic_server.vtc index e66764164..72491f0bc 100644 --- a/reg-tests/server/cli_delete_dynamic_server.vtc +++ b/reg-tests/server/cli_delete_dynamic_server.vtc @@ -21,7 +21,7 @@ server s2 -repeat 3 { -body "resp from s2" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/server/cli_delete_server.vtc b/reg-tests/server/cli_delete_server.vtc index 61d241c2a..8754d1996 100644 --- a/reg-tests/server/cli_delete_server.vtc +++ b/reg-tests/server/cli_delete_server.vtc @@ -6,7 +6,7 @@ varnishtest "Delete server via cli" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/server/cli_set_fqdn.vtc b/reg-tests/server/cli_set_fqdn.vtc index f82674f30..4acfe6517 100644 --- a/reg-tests/server/cli_set_fqdn.vtc +++ b/reg-tests/server/cli_set_fqdn.vtc @@ -9,7 +9,7 @@ feature ignore_unknown_macro server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -24,7 +24,7 @@ haproxy h1 -conf { server www1 ${s1_addr}:${s1_port} } -start -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/server/cli_set_ssl.vtc b/reg-tests/server/cli_set_ssl.vtc index fa6fe68c5..56ef3f283 100644 --- a/reg-tests/server/cli_set_ssl.vtc +++ b/reg-tests/server/cli_set_ssl.vtc @@ -11,7 +11,7 @@ feature ignore_unknown_macro server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global ssl-server-verify none diff --git a/reg-tests/spoe/wrong_init.vtc b/reg-tests/spoe/wrong_init.vtc index 152622c5e..e128fb689 100644 --- a/reg-tests/spoe/wrong_init.vtc +++ b/reg-tests/spoe/wrong_init.vtc @@ -11,7 +11,7 @@ varnishtest "SPOE bug: missing configuration file" feature ignore_unknown_macro -haproxy h1 -conf-BAD {} { +haproxy h1 -arg '-dW' -conf-BAD {} { defaults timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/ssl/add_ssl_crt-list.vtc b/reg-tests/ssl/add_ssl_crt-list.vtc index 6c6379ec3..02e85dd5e 100644 --- a/reg-tests/ssl/add_ssl_crt-list.vtc +++ b/reg-tests/ssl/add_ssl_crt-list.vtc @@ -20,7 +20,7 @@ server s1 -repeat 2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/crt_store.vtc b/reg-tests/ssl/crt_store.vtc index a07ec4e2a..977c824c5 100644 --- a/reg-tests/ssl/crt_store.vtc +++ b/reg-tests/ssl/crt_store.vtc @@ -10,7 +10,7 @@ feature ignore_unknown_macro # -haproxy h1 -arg -V -conf-OK { +haproxy h1 -arg -V -arg '-dW' -conf-OK { crt-store load crt "${testdir}/common.crt" key "${testdir}/common.key" @@ -24,7 +24,7 @@ haproxy h1 -arg -V -conf-OK { } -haproxy h2 -arg -V -conf-BAD {} { +haproxy h2 -arg -V -arg '-dW' -conf-BAD {} { listen ssl-lst bind "${tmpdir}/ssl.sock" ssl crt ${testdir}/common.pem strict-sni diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc b/reg-tests/ssl/del_ssl_crt-list.vtc index 3a2beccb6..cb1bfb3d0 100644 --- a/reg-tests/ssl/del_ssl_crt-list.vtc +++ b/reg-tests/ssl/del_ssl_crt-list.vtc @@ -18,7 +18,7 @@ server s1 -repeat 2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/dynamic_server_ssl.vtc b/reg-tests/ssl/dynamic_server_ssl.vtc index b7730f558..d85c586f7 100644 --- a/reg-tests/ssl/dynamic_server_ssl.vtc +++ b/reg-tests/ssl/dynamic_server_ssl.vtc @@ -17,7 +17,7 @@ server s1 -repeat 3 { -body "resp from s1" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global stats socket "${tmpdir}/h1/stats" level admin diff --git a/reg-tests/ssl/issuers_chain_path.vtc b/reg-tests/ssl/issuers_chain_path.vtc index 9fa90673f..84539ad31 100644 --- a/reg-tests/ssl/issuers_chain_path.vtc +++ b/reg-tests/ssl/issuers_chain_path.vtc @@ -7,7 +7,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && openssl_version_atleast(1 feature cmd "command -v openssl && command -v socat" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global stats socket "${tmpdir}/h1/stats" level admin issuers-chain-path "${testdir}/issuers-chain-path/ca/" diff --git a/reg-tests/ssl/log_forward_ssl.vtc b/reg-tests/ssl/log_forward_ssl.vtc index 6b7515bf8..2f61bd07f 100644 --- a/reg-tests/ssl/log_forward_ssl.vtc +++ b/reg-tests/ssl/log_forward_ssl.vtc @@ -13,7 +13,7 @@ syslog Slg1 -level info { expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* \"GET /client_c1 HTTP/1.1\"" } -repeat 50 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global insecure-fork-wanted defaults diff --git a/reg-tests/ssl/new_del_ssl_cafile.vtc b/reg-tests/ssl/new_del_ssl_cafile.vtc index 7e8a9f19d..3d7d5e060 100644 --- a/reg-tests/ssl/new_del_ssl_cafile.vtc +++ b/reg-tests/ssl/new_del_ssl_cafile.vtc @@ -19,7 +19,7 @@ server s1 -repeat 2 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/new_del_ssl_crlfile.vtc b/reg-tests/ssl/new_del_ssl_crlfile.vtc index 8575f2644..8164f8a81 100644 --- a/reg-tests/ssl/new_del_ssl_crlfile.vtc +++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc @@ -19,7 +19,7 @@ server s1 -repeat 3 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ocsp_auto_update.vtc b/reg-tests/ssl/ocsp_auto_update.vtc index bcaf96b19..2908d495d 100644 --- a/reg-tests/ssl/ocsp_auto_update.vtc +++ b/reg-tests/ssl/ocsp_auto_update.vtc @@ -45,7 +45,7 @@ feature ignore_unknown_macro # This test will only be the most basic one where we check that ocsp response # loading still works as expected. -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -115,7 +115,7 @@ syslog Syslog_ocsp -level notice { barrier b2 sync } -start -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -184,7 +184,7 @@ syslog Syslog_ocsp3 -level notice { barrier b3 sync } -start -haproxy h3 -conf { +haproxy h3 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -258,7 +258,7 @@ syslog Syslog_ocsp4 -level notice { barrier b4 sync } -start -haproxy h4 -conf { +haproxy h4 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -374,7 +374,7 @@ syslog Syslog_ocsp5 -level notice { barrier b5 sync } -start -haproxy h5 -conf { +haproxy h5 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -458,7 +458,7 @@ syslog Syslog_ocsp6 -level notice { barrier b6 sync } -start -haproxy h6 -conf { +haproxy h6 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -536,7 +536,7 @@ syslog Syslog_ocsp7 -level notice { barrier b7 sync } -start -haproxy h7 -conf { +haproxy h7 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -601,7 +601,7 @@ process p7 -wait # instance is removed (via del ssl crt-list). # -haproxy h8 -conf { +haproxy h8 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -697,7 +697,7 @@ syslog Syslog_ocsp9 -level notice { } -start -haproxy h9 -conf { +haproxy h9 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/set_ssl_bug_2265.vtc b/reg-tests/ssl/set_ssl_bug_2265.vtc index c773f134c..d43198b6e 100644 --- a/reg-tests/ssl/set_ssl_bug_2265.vtc +++ b/reg-tests/ssl/set_ssl_bug_2265.vtc @@ -23,7 +23,7 @@ server s1 -repeat 3 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc index 2e5aebbda..feaf34489 100644 --- a/reg-tests/ssl/set_ssl_cafile.vtc +++ b/reg-tests/ssl/set_ssl_cafile.vtc @@ -25,7 +25,7 @@ server s1 -repeat 4 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc index 6373498de..b94af0ff5 100644 --- a/reg-tests/ssl/set_ssl_cert.vtc +++ b/reg-tests/ssl/set_ssl_cert.vtc @@ -29,7 +29,7 @@ server s1 -repeat 9 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/set_ssl_cert_bundle.vtc b/reg-tests/ssl/set_ssl_cert_bundle.vtc index 3b3c0b343..35941e679 100644 --- a/reg-tests/ssl/set_ssl_cert_bundle.vtc +++ b/reg-tests/ssl/set_ssl_cert_bundle.vtc @@ -26,7 +26,7 @@ server s1 -repeat 9 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc b/reg-tests/ssl/set_ssl_cert_noext.vtc index ed5fdb5c7..3ab740e6c 100644 --- a/reg-tests/ssl/set_ssl_cert_noext.vtc +++ b/reg-tests/ssl/set_ssl_cert_noext.vtc @@ -21,7 +21,7 @@ server s1 -repeat 3 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc b/reg-tests/ssl/set_ssl_crlfile.vtc index 86cab0017..01e2cdf4f 100644 --- a/reg-tests/ssl/set_ssl_crlfile.vtc +++ b/reg-tests/ssl/set_ssl_crlfile.vtc @@ -28,7 +28,7 @@ server s1 -repeat 4 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/set_ssl_server_cert.vtc b/reg-tests/ssl/set_ssl_server_cert.vtc index 55d8df0ef..2602b97e9 100644 --- a/reg-tests/ssl/set_ssl_server_cert.vtc +++ b/reg-tests/ssl/set_ssl_server_cert.vtc @@ -14,7 +14,7 @@ server s1 -repeat 4 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/show_ssl_ocspresponse.vtc b/reg-tests/ssl/show_ssl_ocspresponse.vtc index 08969ba2b..235153762 100644 --- a/reg-tests/ssl/show_ssl_ocspresponse.vtc +++ b/reg-tests/ssl/show_ssl_ocspresponse.vtc @@ -25,7 +25,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && !ssllib_name_startswith(B feature cmd "command -v socat && command -v openssl" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_alpn.vtc b/reg-tests/ssl/ssl_alpn.vtc index 9d032769c..889860c52 100644 --- a/reg-tests/ssl/ssl_alpn.vtc +++ b/reg-tests/ssl/ssl_alpn.vtc @@ -9,7 +9,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.8-dev7)'" feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && openssl_version_atleast(1.0.2)'" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_client_auth.vtc b/reg-tests/ssl/ssl_client_auth.vtc index a223a9c18..3f7f085a6 100644 --- a/reg-tests/ssl/ssl_client_auth.vtc +++ b/reg-tests/ssl/ssl_client_auth.vtc @@ -23,7 +23,7 @@ server s1 -repeat 3 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_client_samples.vtc b/reg-tests/ssl/ssl_client_samples.vtc index 6b770822c..aa3995e86 100644 --- a/reg-tests/ssl/ssl_client_samples.vtc +++ b/reg-tests/ssl/ssl_client_samples.vtc @@ -10,7 +10,7 @@ server s1 -repeat 3 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_crt-list_filters.vtc b/reg-tests/ssl/ssl_crt-list_filters.vtc index 843d85af4..f6c87da85 100644 --- a/reg-tests/ssl/ssl_crt-list_filters.vtc +++ b/reg-tests/ssl/ssl_crt-list_filters.vtc @@ -14,7 +14,7 @@ server s1 -repeat 6 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_curve_name.vtc b/reg-tests/ssl/ssl_curve_name.vtc index 551679177..6d08ccaaa 100644 --- a/reg-tests/ssl/ssl_curve_name.vtc +++ b/reg-tests/ssl/ssl_curve_name.vtc @@ -9,7 +9,7 @@ server s1 -repeat 3 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_curves.vtc b/reg-tests/ssl/ssl_curves.vtc index 5ffd2d8bd..9c4d5ec57 100644 --- a/reg-tests/ssl/ssl_curves.vtc +++ b/reg-tests/ssl/ssl_curves.vtc @@ -37,7 +37,7 @@ syslog Slg_cust_fmt -level info { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_default_server.vtc b/reg-tests/ssl/ssl_default_server.vtc index 88a3ccbe4..3f4116d30 100644 --- a/reg-tests/ssl/ssl_default_server.vtc +++ b/reg-tests/ssl/ssl_default_server.vtc @@ -20,7 +20,7 @@ server s1 -repeat 7 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_dh.vtc b/reg-tests/ssl/ssl_dh.vtc index 5fe7c88aa..a76a7c941 100644 --- a/reg-tests/ssl/ssl_dh.vtc +++ b/reg-tests/ssl/ssl_dh.vtc @@ -29,7 +29,7 @@ server s1 -repeat 8 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global stats socket "${tmpdir}/h1/stats" level admin @@ -65,7 +65,7 @@ haproxy h1 -conf { server s1 ${s1_addr}:${s1_port} } -start -haproxy h2 -conf { +haproxy h2 -arg '-dW' -conf { global stats socket "${tmpdir}/h2/stats" level admin @@ -92,7 +92,7 @@ haproxy h2 -conf { server s1 ${s1_addr}:${s1_port} } -start -haproxy h3 -conf { +haproxy h3 -arg '-dW' -conf { global stats socket "${tmpdir}/h3/stats" level admin diff --git a/reg-tests/ssl/ssl_errors.vtc b/reg-tests/ssl/ssl_errors.vtc index a3c54553c..93683d8a6 100644 --- a/reg-tests/ssl/ssl_errors.vtc +++ b/reg-tests/ssl/ssl_errors.vtc @@ -166,7 +166,7 @@ syslog Slg_bcknd_fe -level info { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_frontend_samples.vtc b/reg-tests/ssl/ssl_frontend_samples.vtc index 56a208bcc..97dab56e9 100644 --- a/reg-tests/ssl/ssl_frontend_samples.vtc +++ b/reg-tests/ssl/ssl_frontend_samples.vtc @@ -9,7 +9,7 @@ server s1 -repeat 3 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_generate_certificate.vtc b/reg-tests/ssl/ssl_generate_certificate.vtc index ace27d877..2cef98881 100644 --- a/reg-tests/ssl/ssl_generate_certificate.vtc +++ b/reg-tests/ssl/ssl_generate_certificate.vtc @@ -25,7 +25,7 @@ server s1 -repeat 6 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_reuse.vtc b/reg-tests/ssl/ssl_reuse.vtc index d7244eeb4..a310be8f0 100644 --- a/reg-tests/ssl/ssl_reuse.vtc +++ b/reg-tests/ssl/ssl_reuse.vtc @@ -13,7 +13,7 @@ server s1 -repeat 84 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # forced to 1 here, because there is a cached session per thread nbthread 1 diff --git a/reg-tests/ssl/ssl_server_samples.vtc b/reg-tests/ssl/ssl_server_samples.vtc index 2841d1cc6..9fc7422b2 100644 --- a/reg-tests/ssl/ssl_server_samples.vtc +++ b/reg-tests/ssl/ssl_server_samples.vtc @@ -9,7 +9,7 @@ server s1 -repeat 3 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc b/reg-tests/ssl/ssl_simple_crt-list.vtc index d70327b0b..0f56bad23 100644 --- a/reg-tests/ssl/ssl_simple_crt-list.vtc +++ b/reg-tests/ssl/ssl_simple_crt-list.vtc @@ -10,7 +10,7 @@ server s1 -repeat 4 { txresp } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/ssl/wrong_ctx_storage.vtc b/reg-tests/ssl/wrong_ctx_storage.vtc index 4275731fe..73316afc7 100644 --- a/reg-tests/ssl/wrong_ctx_storage.vtc +++ b/reg-tests/ssl/wrong_ctx_storage.vtc @@ -22,7 +22,7 @@ varnishtest "OpenSSL bug: Random crashes" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 diff --git a/reg-tests/startup/automatic_maxconn.vtc b/reg-tests/startup/automatic_maxconn.vtc index 017391619..501bb561c 100644 --- a/reg-tests/startup/automatic_maxconn.vtc +++ b/reg-tests/startup/automatic_maxconn.vtc @@ -18,7 +18,7 @@ server s1 { } -start -haproxy h1 -arg "-m 1024" -conf { +haproxy h1 -arg "-m 1024" -arg '-dW' -conf { } -start haproxy h1 -cli { @@ -26,7 +26,7 @@ haproxy h1 -cli { expect ~ ".*Maxconn: (29000|28000)\n.*" } -haproxy h2 -arg "-m 384" -conf { +haproxy h2 -arg "-m 384" -arg '-dW' -conf { } -start haproxy h2 -cli { @@ -34,7 +34,7 @@ haproxy h2 -cli { expect ~ ".*Maxconn: (11000|10000)\n.*" } -haproxy h3 -arg "-m 256" -conf { +haproxy h3 -arg "-m 256" -arg '-dW' -conf { } -start haproxy h3 -cli { @@ -44,7 +44,7 @@ haproxy h3 -cli { # 1 SSL front but no back -haproxy h4 -arg "-m 256" -conf { +haproxy h4 -arg "-m 256" -arg '-dW' -conf { defaults mode http timeout connect 1s @@ -63,7 +63,7 @@ haproxy h4 -cli { # 1 SSL back but not front -haproxy h5 -arg "-m 256" -conf { +haproxy h5 -arg "-m 256" -arg '-dW' -conf { defaults mode http timeout connect 1s @@ -84,7 +84,7 @@ haproxy h5 -cli { # 1 SSL front and 1 back -haproxy h6 -arg "-m 256" -conf { +haproxy h6 -arg "-m 256" -arg '-dW' -conf { defaults mode http timeout connect 1s diff --git a/reg-tests/startup/default_rules.vtc b/reg-tests/startup/default_rules.vtc index 654e9cf3d..89a9259bd 100644 --- a/reg-tests/startup/default_rules.vtc +++ b/reg-tests/startup/default_rules.vtc @@ -6,38 +6,38 @@ feature ignore_unknown_macro # # anonymous defaults section cannot define TCP/HTTP rules # -haproxy h1 -conf-BAD {} { +haproxy h1 -arg '-dW' -conf-BAD {} { defaults http-request set-header X-Hdr 1 } -haproxy h2 -conf-BAD {} { +haproxy h2 -arg '-dW' -conf-BAD {} { defaults http-response set-header X-Hdr 1 } -haproxy h3 -conf-BAD {} { +haproxy h3 -arg '-dW' -conf-BAD {} { defaults http-after-request set-header X-Hdr 1 } -haproxy h4 -conf-BAD {} { +haproxy h4 -arg '-dW' -conf-BAD {} { defaults tcp-request connection accept } -haproxy h5 -conf-BAD {} { +haproxy h5 -arg '-dW' -conf-BAD {} { defaults tcp-request session accept } -haproxy h6 -conf-BAD {} { +haproxy h6 -arg '-dW' -conf-BAD {} { defaults tcp-request inspect-delay 5s tcp-request content accept } -haproxy h7 -conf-BAD {} { +haproxy h7 -arg '-dW' -conf-BAD {} { defaults tcp-response inspect-delay 5s tcp-response content accept @@ -47,7 +47,7 @@ haproxy h7 -conf-BAD {} { # defaults section defining TCP/HTTP rules cannot be used to init another # defaults section # -haproxy h8 -conf-BAD {} { +haproxy h8 -arg '-dW' -conf-BAD {} { defaults invalid tcp-response inspect-delay 5s tcp-response content accept @@ -60,7 +60,7 @@ haproxy h8 -conf-BAD {} { # defaults section defining TCP/HTTP rules cannot be used to init a listen # section # -haproxy h9 -conf-BAD {} { +haproxy h9 -arg '-dW' -conf-BAD {} { defaults invalid tcp-request inspect-delay 5s tcp-request content accept @@ -76,7 +76,7 @@ haproxy h9 -conf-BAD {} { # backend sections at the same time # # -haproxy h10 -conf-BAD {} { +haproxy h10 -arg '-dW' -conf-BAD {} { defaults invalid tcp-request inspect-delay 5s tcp-request content accept @@ -95,7 +95,7 @@ haproxy h10 -conf-BAD {} { # defaults section defining 'tcp-request connection' or 'tcp-request session' # rules cannot be used to init backend sections # -haproxy h11 -conf-BAD {} { +haproxy h11 -arg '-dW' -conf-BAD {} { defaults invalid tcp-request connection accept @@ -104,7 +104,7 @@ haproxy h11 -conf-BAD {} { server www 127.0.0.1:80 } -haproxy h12 -conf-BAD {} { +haproxy h12 -arg '-dW' -conf-BAD {} { defaults invalid tcp-request session accept @@ -117,7 +117,7 @@ haproxy h12 -conf-BAD {} { # defaults section defining 'tcp-response content' rules cannot be used to init # a frontend section # -haproxy h13 -conf-BAD {} { +haproxy h13 -arg '-dW' -conf-BAD {} { defaults invalid tcp-response inspect-delay 5s tcp-response content accept @@ -127,7 +127,7 @@ haproxy h13 -conf-BAD {} { bind "fd@${feh10}" } -haproxy h14 -arg -V -conf-OK { +haproxy h14 -arg -V -arg '-dW' -conf-OK { defaults tcp timeout client 30s timeout server 30s @@ -145,7 +145,7 @@ haproxy h14 -arg -V -conf-OK { # SRV/TAB arguments without an explicit proxy name are not allowed. # -haproxy h15 -conf-BAD {} { +haproxy h15 -arg '-dW' -conf-BAD {} { defaults invalid mode http http-request set-header x-test "%[srv_conn(www)]" @@ -154,7 +154,7 @@ haproxy h15 -conf-BAD {} { server www 127.0.0.1:80 } -haproxy h16 -conf-BAD {} { +haproxy h16 -arg '-dW' -conf-BAD {} { defaults invalid mode http http-request track-sc0 src @@ -165,7 +165,7 @@ haproxy h16 -conf-BAD {} { server www 127.0.0.1:80 } -haproxy h17 -arg -V -conf-OK { +haproxy h17 -arg -V -arg '-dW' -conf-OK { defaults common timeout client 30s timeout server 30s diff --git a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc index 533765fc6..c69c53f41 100644 --- a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc +++ b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc @@ -26,7 +26,7 @@ feature ignore_unknown_macro server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { # Configuration file of 'h1' haproxy instance. defaults mode http diff --git a/reg-tests/stick-table/src_conn_rate.vtc b/reg-tests/stick-table/src_conn_rate.vtc index bdf8869be..2b6903417 100644 --- a/reg-tests/stick-table/src_conn_rate.vtc +++ b/reg-tests/stick-table/src_conn_rate.vtc @@ -1,7 +1,7 @@ varnishtest "stick table: src_conn_rate" feature ignore_unknown_macro -haproxy h0 -conf { +haproxy h0 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/stick-table/unknown_key.vtc b/reg-tests/stick-table/unknown_key.vtc index f0307cb21..d7a69136e 100644 --- a/reg-tests/stick-table/unknown_key.vtc +++ b/reg-tests/stick-table/unknown_key.vtc @@ -10,7 +10,7 @@ server s0 { txresp } -start -haproxy h0 -conf { +haproxy h0 -arg '-dW' -conf { defaults timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/stickiness/lb-services.vtc b/reg-tests/stickiness/lb-services.vtc index 23c9a9afd..d34699183 100644 --- a/reg-tests/stickiness/lb-services.vtc +++ b/reg-tests/stickiness/lb-services.vtc @@ -41,7 +41,7 @@ server s4 { txresp -hdr "Server: be2/s4" } -repeat 2 -start -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" @@ -104,7 +104,7 @@ server s8 { } -repeat 2 -start -haproxy h2 -arg "-L B" -conf { +haproxy h2 -arg "-L B" -arg '-dW' -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/stickiness/srvkey-addr.vtc b/reg-tests/stickiness/srvkey-addr.vtc index 0dc1148f9..675a0d59f 100644 --- a/reg-tests/stickiness/srvkey-addr.vtc +++ b/reg-tests/stickiness/srvkey-addr.vtc @@ -32,7 +32,7 @@ server s2 { txresp -hdr "Server: s2" } -repeat 8 -start -haproxy h1 -arg "-L A" -conf { +haproxy h1 -arg "-L A" -arg '-dW' -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" @@ -73,7 +73,7 @@ haproxy h1 -arg "-L A" -conf { bind "fd@${fe}" } -haproxy h2 -arg "-L B" -conf { +haproxy h2 -arg "-L B" -arg '-dW' -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/stream/unique-id-from-proxy.vtc b/reg-tests/stream/unique-id-from-proxy.vtc index fc91f257d..7a48ffdec 100644 --- a/reg-tests/stream/unique-id-from-proxy.vtc +++ b/reg-tests/stream/unique-id-from-proxy.vtc @@ -2,7 +2,7 @@ varnishtest "Check that we are able to read a unique-id from PROXYv2" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/stream/unique-id.vtc b/reg-tests/stream/unique-id.vtc index 0607b2a4f..0bd4f833c 100644 --- a/reg-tests/stream/unique-id.vtc +++ b/reg-tests/stream/unique-id.vtc @@ -7,7 +7,7 @@ server s1 { txresp } -repeat 2 -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/tcp-rules/default_rules.vtc b/reg-tests/tcp-rules/default_rules.vtc index 8c05f4306..b8a9d868d 100644 --- a/reg-tests/tcp-rules/default_rules.vtc +++ b/reg-tests/tcp-rules/default_rules.vtc @@ -10,7 +10,7 @@ server s1 { expect req.http.x-test1-bck == "def_back" } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { defaults common mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" diff --git a/reg-tests/webstats/missing-stats-fields.vtc b/reg-tests/webstats/missing-stats-fields.vtc index 8b292c386..e27201cae 100644 --- a/reg-tests/webstats/missing-stats-fields.vtc +++ b/reg-tests/webstats/missing-stats-fields.vtc @@ -5,7 +5,7 @@ varnishtest "Verifies the absence of (null) in 'show stats' header" feature ignore_unknown_macro -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { } -start haproxy h1 -cli { diff --git a/reg-tests/webstats/webstats-scope-and-post-change.vtc b/reg-tests/webstats/webstats-scope-and-post-change.vtc index 7830ae5b4..7f477b2c5 100644 --- a/reg-tests/webstats/webstats-scope-and-post-change.vtc +++ b/reg-tests/webstats/webstats-scope-and-post-change.vtc @@ -5,7 +5,7 @@ feature ignore_unknown_macro server s1 { } -start -haproxy h1 -conf { +haproxy h1 -arg '-dW' -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring