From 6f746af915103bc73401dca55b0d7c4f7d88807f Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Tue, 19 Nov 2024 16:51:30 +0100 Subject: [PATCH] REGTESTS: use -dW by default on every reg-tests Every reg-test now runs without any warning, so let's acivate -dW by default so the new ones will inheritate the option. This patch reverts 9d511b3c ("REGTESTS: enable -dW on almost all tests to fail on warnings") and adds -dW in the default HAPROXY_ARGS of scripts/run-regtests.sh instead. --- reg-tests/balance/balance-rr.vtc | 2 +- reg-tests/balance/balance-uri-path-only.vtc | 2 +- reg-tests/balance/balance-uri.vtc | 2 +- reg-tests/cache/basic.vtc | 2 +- reg-tests/cache/caching_rules.vtc | 2 +- reg-tests/cache/expires.vtc | 2 +- reg-tests/cache/if-modified-since.vtc | 2 +- reg-tests/cache/if-none-match.vtc | 2 +- reg-tests/cache/post_on_entry.vtc | 2 +- reg-tests/cache/sample_fetches.vtc | 2 +- reg-tests/cache/vary.vtc | 2 +- reg-tests/cache/vary_accept_encoding.vtc | 2 +- .../checks/1be_40srv_odd_health_checks.vtc | 2 +- .../checks/40be_2srv_odd_health_checks.vtc | 2 +- reg-tests/checks/4be_1srv_health_checks.vtc | 2 +- ...4be_1srv_smtpchk_httpchk_layer47errors.vtc | 2 +- reg-tests/checks/agent-check.vtc | 2 +- reg-tests/checks/http-check-expect.vtc | 2 +- reg-tests/checks/http-check-send.vtc | 2 +- reg-tests/checks/http-check.vtc | 2 +- reg-tests/checks/http-monitor-uri.vtc | 2 +- reg-tests/checks/ldap-check.vtc | 2 +- reg-tests/checks/mysql-check.vtc | 2 +- reg-tests/checks/pgsql-check.vtc | 2 +- reg-tests/checks/redis-check.vtc | 2 +- reg-tests/checks/smtp-check.vtc | 2 +- reg-tests/checks/spop-check.vtc | 2 +- reg-tests/checks/ssl-hello-check.vtc | 4 +-- reg-tests/checks/tcp-check-ssl.vtc | 4 +-- reg-tests/checks/tcp-check_min-recv.vtc | 2 +- reg-tests/checks/tcp-check_multiple_ports.vtc | 2 +- reg-tests/checks/tcp-checks-socks4.vtc | 2 +- reg-tests/checks/tls_health_checks.vtc | 4 +-- reg-tests/compression/basic.vtc | 2 +- reg-tests/compression/etags_conversion.vtc | 2 +- reg-tests/compression/lua_validation.vtc | 2 +- reg-tests/compression/vary.vtc | 2 +- reg-tests/connection/cli_src_dst.vtc | 2 +- reg-tests/connection/dispatch.vtc | 2 +- reg-tests/connection/h2_glitches.vtc | 2 +- .../connection/http_reuse_aggressive.vtc | 2 +- reg-tests/connection/http_reuse_always.vtc | 2 +- .../connection/http_reuse_be_transparent.vtc | 2 +- reg-tests/connection/http_reuse_conn_hash.vtc | 2 +- reg-tests/connection/http_reuse_dispatch.vtc | 2 +- reg-tests/connection/http_reuse_never.vtc | 2 +- reg-tests/connection/http_reuse_safe.vtc | 2 +- .../connection/proxy_protocol_random_fail.vtc | 2 +- .../proxy_protocol_send_generic.vtc | 4 +-- .../proxy_protocol_send_unique_id.vtc | 2 +- .../proxy_protocol_send_unique_id_alpn.vtc | 2 +- .../proxy_protocol_tlv_validation.vtc | 8 ++--- reg-tests/connection/reverse_connect_full.vtc | 4 +-- reg-tests/connection/reverse_server.vtc | 2 +- reg-tests/connection/reverse_server_name.vtc | 4 +-- reg-tests/connection/tcp_to_http_upgrade.vtc | 2 +- reg-tests/contrib/prometheus.vtc | 2 +- reg-tests/converter/add_item.vtc | 2 +- reg-tests/converter/be2dec.vtc | 2 +- reg-tests/converter/be2hex.vtc | 2 +- reg-tests/converter/bytes.vtc | 8 ++--- reg-tests/converter/digest.vtc | 2 +- reg-tests/converter/field.vtc | 2 +- reg-tests/converter/fix.vtc | 2 +- reg-tests/converter/hmac.vtc | 2 +- reg-tests/converter/iif.vtc | 2 +- reg-tests/converter/json.vtc | 2 +- reg-tests/converter/json_query.vtc | 2 +- reg-tests/converter/mqtt.vtc | 2 +- reg-tests/converter/param.vtc | 2 +- reg-tests/converter/secure_memcmp.vtc | 2 +- reg-tests/converter/sha2.vtc | 2 +- reg-tests/converter/url_dec.vtc | 2 +- reg-tests/converter/url_enc.vtc | 2 +- reg-tests/converter/word.vtc | 2 +- reg-tests/filters/random-forwarding.vtc | 2 +- reg-tests/http-capture/multiple_headers.vtc | 2 +- .../http-cookies/cookie_insert_indirect.vtc | 2 +- reg-tests/http-cookies/h2_cookie_concat.vtc | 2 +- reg-tests/http-errorfiles/errorfiles.vtc | 2 +- reg-tests/http-errorfiles/http-error.vtc | 2 +- .../http-errorfiles/http_deny_errors.vtc | 2 +- reg-tests/http-errorfiles/http_errors.vtc | 2 +- reg-tests/http-errorfiles/http_return.vtc | 2 +- .../http-messaging/h1_host_normalization.vtc | 2 +- .../h1_request_target_validation.vtc | 2 +- reg-tests/http-messaging/h1_to_h1.vtc | 2 +- .../http-messaging/h2_desync_attacks.vtc | 2 +- reg-tests/http-messaging/h2_to_h1.vtc | 2 +- .../http-messaging/http_abortonclose.vtc | 4 +-- .../http-messaging/http_bodyless_response.vtc | 2 +- .../http_bodyless_spliced_response.vtc | 2 +- .../http-messaging/http_msg_full_on_eom.vtc | 2 +- .../http-messaging/http_request_buffer.vtc | 2 +- reg-tests/http-messaging/http_splicing.vtc | 2 +- .../http-messaging/http_splicing_chunk.vtc | 2 +- .../http-messaging/http_transfer_encoding.vtc | 2 +- .../http-messaging/http_wait_for_body.vtc | 2 +- reg-tests/http-messaging/protocol_upgrade.vtc | 2 +- .../http-messaging/scheme_based_normalize.vtc | 2 +- reg-tests/http-messaging/srv_ws.vtc | 4 +-- reg-tests/http-messaging/truncated.vtc | 2 +- reg-tests/http-messaging/websocket.vtc | 6 ++-- reg-tests/http-rules/acl_cli_spaces.vtc | 2 +- ...erters_ipmask_concat_strcmp_field_word.vtc | 4 +-- reg-tests/http-rules/default_rules.vtc | 6 ++-- reg-tests/http-rules/del_header.vtc | 2 +- .../except-forwardfor-originalto.vtc | 2 +- .../http-rules/forwarded-header-7239.vtc | 4 +-- reg-tests/http-rules/h1or2_to_h1c.vtc | 2 +- reg-tests/http-rules/http-err-fail.vtc | 2 +- reg-tests/http-rules/http_after_response.vtc | 2 +- reg-tests/http-rules/http_return.vtc | 2 +- reg-tests/http-rules/ifnone-forwardfor.vtc | 2 +- reg-tests/http-rules/map_ordering.vtc | 2 +- reg-tests/http-rules/map_redirect.vtc | 2 +- .../http-rules/map_regm_with_backref.vtc | 2 +- reg-tests/http-rules/normalize_uri.vtc | 2 +- reg-tests/http-rules/path_and_pathq.vtc | 2 +- .../http-rules/restrict_req_hdr_names.vtc | 2 +- reg-tests/http-rules/strict_rw_mode.vtc | 2 +- reg-tests/http-set-timeout/set_timeout.vtc | 2 +- reg-tests/jwt/jws_verify.vtc | 2 +- reg-tests/log/last_rule.vtc | 2 +- reg-tests/log/load_balancing.vtc | 2 +- reg-tests/log/log_backend.vtc | 2 +- reg-tests/log/log_forward.vtc | 2 +- reg-tests/log/log_profiles.vtc | 2 +- reg-tests/log/log_uri.vtc | 2 +- reg-tests/log/wrong_ip_port_logging.vtc | 2 +- reg-tests/lua/bad_http_clt_req_duration.vtc | 2 +- reg-tests/lua/close_wait_lf.vtc | 2 +- reg-tests/lua/h_txn_get_priv.vtc | 2 +- reg-tests/lua/httpclient_action.vtc | 2 +- reg-tests/lua/lua_httpclient.vtc | 2 +- reg-tests/lua/lua_socket.vtc | 2 +- reg-tests/lua/set_var.vtc | 2 +- reg-tests/lua/txn_get_priv-thread.vtc | 2 +- reg-tests/lua/txn_get_priv.vtc | 2 +- reg-tests/lua/wrong_types_usage.vtc | 2 +- reg-tests/mailers/healthcheckmail.vtc | 2 +- reg-tests/mcli/mcli_debug_dev.vtc | 2 +- reg-tests/mcli/mcli_show_info.vtc | 2 +- reg-tests/peers/basic_sync.vtc | 6 ++-- .../peers/basic_sync_wo_stkt_backend.vtc | 6 ++-- reg-tests/peers/tls_basic_sync.vtc | 8 ++--- .../peers/tls_basic_sync_wo_stkt_backend.vtc | 8 ++--- reg-tests/sample_fetches/acl.vtc | 2 +- reg-tests/sample_fetches/cond_set_var.vtc | 2 +- reg-tests/sample_fetches/cook.vtc | 8 ++--- reg-tests/sample_fetches/hashes.vtc | 2 +- reg-tests/sample_fetches/so_name.vtc | 2 +- reg-tests/sample_fetches/srv_name.vtc | 2 +- reg-tests/sample_fetches/tcpinfo_rtt.vtc | 2 +- reg-tests/sample_fetches/tlvs.vtc | 2 +- reg-tests/sample_fetches/ubase64.vtc | 2 +- reg-tests/sample_fetches/vars.vtc | 2 +- reg-tests/seamless-reload/abns_socket.vtc | 2 +- reg-tests/server/abnsz.vtc | 2 +- reg-tests/server/cli_add_check_server.vtc | 2 +- reg-tests/server/cli_add_server.vtc | 2 +- reg-tests/server/cli_add_ssl_server.vtc | 2 +- reg-tests/server/cli_add_track_server.vtc | 2 +- .../server/cli_delete_dynamic_server.vtc | 2 +- reg-tests/server/cli_delete_server.vtc | 2 +- reg-tests/server/cli_set_fqdn.vtc | 4 +-- reg-tests/server/cli_set_ssl.vtc | 2 +- reg-tests/spoe/wrong_init.vtc | 2 +- reg-tests/ssl/add_ssl_crt-list.vtc | 2 +- reg-tests/ssl/crt_store.vtc | 4 +-- reg-tests/ssl/del_ssl_crt-list.vtc | 2 +- reg-tests/ssl/dynamic_server_ssl.vtc | 2 +- reg-tests/ssl/issuers_chain_path.vtc | 2 +- reg-tests/ssl/log_forward_ssl.vtc | 2 +- reg-tests/ssl/new_del_ssl_cafile.vtc | 2 +- reg-tests/ssl/new_del_ssl_crlfile.vtc | 2 +- reg-tests/ssl/ocsp_auto_update.vtc | 18 +++++----- reg-tests/ssl/set_ssl_bug_2265.vtc | 2 +- reg-tests/ssl/set_ssl_cafile.vtc | 2 +- reg-tests/ssl/set_ssl_cert.vtc | 2 +- reg-tests/ssl/set_ssl_cert_bundle.vtc | 2 +- reg-tests/ssl/set_ssl_cert_noext.vtc | 2 +- reg-tests/ssl/set_ssl_crlfile.vtc | 2 +- reg-tests/ssl/set_ssl_server_cert.vtc | 2 +- reg-tests/ssl/show_ssl_ocspresponse.vtc | 2 +- reg-tests/ssl/ssl_alpn.vtc | 2 +- reg-tests/ssl/ssl_client_auth.vtc | 2 +- reg-tests/ssl/ssl_client_samples.vtc | 2 +- reg-tests/ssl/ssl_crt-list_filters.vtc | 2 +- reg-tests/ssl/ssl_curve_name.vtc | 2 +- reg-tests/ssl/ssl_curves.vtc | 2 +- reg-tests/ssl/ssl_default_server.vtc | 2 +- reg-tests/ssl/ssl_dh.vtc | 6 ++-- reg-tests/ssl/ssl_errors.vtc | 2 +- reg-tests/ssl/ssl_frontend_samples.vtc | 2 +- reg-tests/ssl/ssl_generate_certificate.vtc | 2 +- reg-tests/ssl/ssl_reuse.vtc | 2 +- reg-tests/ssl/ssl_server_samples.vtc | 2 +- reg-tests/ssl/ssl_simple_crt-list.vtc | 2 +- reg-tests/ssl/wrong_ctx_storage.vtc | 2 +- reg-tests/startup/automatic_maxconn.vtc | 12 +++---- reg-tests/startup/default_rules.vtc | 34 +++++++++---------- .../converteers_ref_cnt_never_dec.vtc | 2 +- reg-tests/stick-table/src_conn_rate.vtc | 2 +- reg-tests/stick-table/unknown_key.vtc | 2 +- reg-tests/stickiness/lb-services.vtc | 4 +-- reg-tests/stickiness/srvkey-addr.vtc | 4 +-- reg-tests/stream/unique-id-from-proxy.vtc | 2 +- reg-tests/stream/unique-id.vtc | 2 +- reg-tests/tcp-rules/default_rules.vtc | 2 +- reg-tests/webstats/missing-stats-fields.vtc | 2 +- .../webstats-scope-and-post-change.vtc | 2 +- scripts/run-regtests.sh | 2 +- 213 files changed, 281 insertions(+), 281 deletions(-) diff --git a/reg-tests/balance/balance-rr.vtc b/reg-tests/balance/balance-rr.vtc index 50af85a304..908a4f9af3 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -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 348067a0f2..f1291ee249 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -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 baeb044ab7..e67883567b 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -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 43ae58f4a3..377cbb3792 100644 --- a/reg-tests/cache/basic.vtc +++ b/reg-tests/cache/basic.vtc @@ -22,7 +22,7 @@ server s1 { chunkedlen 0 } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 66a821ac9b..a488875b30 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 -arg '-dW' -conf { +haproxy h1 -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 9a946dab7f..ee5cd775ad 100644 --- a/reg-tests/cache/expires.vtc +++ b/reg-tests/cache/expires.vtc @@ -39,7 +39,7 @@ server s3 { chunkedlen 0 } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 c0c85ee20a..1fd9a931a0 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 -arg '-dW' -conf { +haproxy h1 -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 69f2f0086a..3dcaec57c7 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 -arg '-dW' -conf { +haproxy h1 -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 28d1e9878c..66c89e4e48 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 -arg '-dW' -conf { +haproxy h1 -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 be73dd5043..c2b99c20ca 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 -arg '-dW' -conf { +haproxy h1 -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 612bfadd25..782a76ca76 100644 --- a/reg-tests/cache/vary.vtc +++ b/reg-tests/cache/vary.vtc @@ -165,7 +165,7 @@ server s2 { -bodylen 57 } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 3213b6a87b..4b828a86a6 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 -arg '-dW' -conf { +haproxy h1 -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 86a6b21360..d0f3be53ae 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 -arg '-dW' -conf { +haproxy h1 -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 4293d67814..cbd4fc00e6 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 -arg '-dW' -conf { +haproxy h1 -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 7b0d6ca65c..02564be54c 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 -arg '-dW' -conf { +haproxy h1 -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 6a521c9bfd..3d3649125f 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 -arg '-dW' -conf { +haproxy h1 -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 b6fac32619..5cf51c658e 100644 --- a/reg-tests/checks/agent-check.vtc +++ b/reg-tests/checks/agent-check.vtc @@ -14,7 +14,7 @@ server s1 { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 2f43dff641..118eef6d81 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 -arg '-dW' -conf { +haproxy h1 -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 7435fdd174..530ad75669 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 -arg '-dW' -conf { +haproxy h1 -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 a03bbbde79..31ef87abb0 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 -arg '-dW' -conf { +haproxy h1 -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 215d7a0bc7..26e6e8136b 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 -arg '-dW' -conf { +haproxy h1 -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 24ac0bef86..38204bf3b3 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 -arg '-dW' -conf { +haproxy h1 -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 96605676fb..3600138065 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 -arg '-dW' -conf { +haproxy h1 -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 c64d5b7481..5003e7df10 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 -arg '-dW' -conf { +haproxy h1 -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 e65b3bc39e..3c74c93e85 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 -arg '-dW' -conf { +haproxy h1 -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 fa16ca1bed..6a5f7b79db 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 -arg '-dW' -conf { +haproxy h1 -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 c022dac3a7..8a7fbd3add 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 -arg '-dW' -conf { +haproxy h1 -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 704945f5b0..a44b6e15cb 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 -arg '-dW' -conf { +haproxy htst -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -46,7 +46,7 @@ haproxy htst -arg '-dW' -conf { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 7d23b61140..4020f73f5a 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 -arg '-dW' -conf { +haproxy htst -conf { global .if !ssllib_name_startswith(AWS-LC) tune.ssl.default-dh-param 2048 @@ -62,7 +62,7 @@ haproxy htst -arg '-dW' -conf { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 0025de63fb..83f4c6b913 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 -arg '-dW' -conf { +haproxy h1 -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 ee27fbd937..356ddf61c1 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 -arg '-dW' -conf { +haproxy h1 -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 aaf2ce28f9..8a730f5424 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 -arg '-dW' -conf { +haproxy h1 -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 7d05193d56..9c3039f53e 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 -arg '-dW' -conf { +haproxy h1 -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 -arg '-dW' -conf { +haproxy h2 -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 5b1f3e876e..5d9eadabde 100644 --- a/reg-tests/compression/basic.vtc +++ b/reg-tests/compression/basic.vtc @@ -176,7 +176,7 @@ server s1 { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 aef3c78082..96e34bcf9c 100644 --- a/reg-tests/compression/etags_conversion.vtc +++ b/reg-tests/compression/etags_conversion.vtc @@ -104,7 +104,7 @@ server s1 { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 beeb8e48a9..817820ae17 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 -arg '-dW' -conf { +haproxy h1 -conf { global lua-load ${testdir}/lua_validation.lua diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc index 9555858889..489de30f64 100644 --- a/reg-tests/compression/vary.vtc +++ b/reg-tests/compression/vary.vtc @@ -109,7 +109,7 @@ server s2 { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 2c8cfc1bd0..6809d3948a 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 -arg '-dW' -conf { +haproxy h1 -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 a25d823618..8696b506eb 100644 --- a/reg-tests/connection/dispatch.vtc +++ b/reg-tests/connection/dispatch.vtc @@ -11,7 +11,7 @@ server s2 { txresp } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 73d3c6a5f9..2bf542f04a 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 -arg '-dW' -conf { +haproxy hap -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 817d843738..571a974120 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 -arg '-dW' -conf { +haproxy h1 -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 58968454ad..8931a03427 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 -arg '-dW' -conf { +haproxy h1 -W -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 91a72556a1..f83511c61d 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 -arg '-dW' -conf { +haproxy h1 -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 8a3142152b..82d46042b1 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 -arg '-dW' -conf { +haproxy h1 -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 fa563de92c..ae6dd769f7 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 -arg '-dW' -conf { +haproxy h1 -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 c24c402f14..d04bdfe59a 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 -arg '-dW' -conf { +haproxy h1 -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 c8f69bf8e4..c554694ab6 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 -arg '-dW' -conf { +haproxy h1 -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 e1922960f2..93667decf6 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 -arg '-dW' -conf { +haproxy h1 -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 d51f9226e6..af42dd342e 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 -arg '-dW' -conf { +haproxy h1 -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 -arg '-dW' -conf { +haproxy h2 -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 502a0e7968..b020ae850c 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 -arg '-dW' -conf { +haproxy h1 -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 6a46f84bfe..7ea30a5a2b 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 -arg '-dW' -conf { +haproxy h1 -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 0294603b04..8c7d734edd 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 -arg '-dW' -conf { +haproxy h1 -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 -arg '-dW' -conf { +haproxy h2 -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 -arg '-dW' -conf { +haproxy h3 -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 -arg '-dW' -conf { +haproxy h4 -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 2ff6cdff22..cc88382ced 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 -arg '-dW' -conf { +haproxy h_edge -conf { global expose-experimental-directives @@ -31,7 +31,7 @@ backend be-reverse server dev rhttp@ } -start -haproxy h_dev -arg '-dW' -conf { +haproxy h_dev -conf { global expose-experimental-directives diff --git a/reg-tests/connection/reverse_server.vtc b/reg-tests/connection/reverse_server.vtc index 65aca8d303..5cd77ca7bb 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 -arg '-dW' -conf { +haproxy h_edge -conf { global expose-experimental-directives diff --git a/reg-tests/connection/reverse_server_name.vtc b/reg-tests/connection/reverse_server_name.vtc index 3508934e67..3a24601743 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 -arg '-dW' -conf { +haproxy h_edge -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 -arg '-dW' -conf { +haproxy h_ssl_bridge -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 a948e6b2d7..39cedd3d5d 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 -arg '-dW' -conf { +haproxy h1 -conf { defaults timeout client 30s timeout server 30s diff --git a/reg-tests/contrib/prometheus.vtc b/reg-tests/contrib/prometheus.vtc index 359f1834d4..89d65d7b74 100644 --- a/reg-tests/contrib/prometheus.vtc +++ b/reg-tests/contrib/prometheus.vtc @@ -15,7 +15,7 @@ server s2 { txresp } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 b1716ad3ae..474ad7bf81 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 -arg '-dW' -conf { +haproxy h1 -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 2a169e7617..a0b71046bc 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 -arg '-dW' -conf { +haproxy h1 -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 2b378e03ae..4cf3dc1dfc 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 -arg '-dW' -conf { +haproxy h1 -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 b8e43bd841..8abe401e55 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 -arg '-dW' -conf { +haproxy h1 -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 -arg '-dW' -conf { +haproxy h2 -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -117,7 +117,7 @@ haproxy h2 -arg '-dW' -conf { # TEST - 3 # negative length causes startup failure -haproxy h3 -arg '-dW' -conf { +haproxy h3 -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -137,7 +137,7 @@ haproxy h3 -arg '-dW' -conf { # TEST - 4 # 0 length causes startup failure -haproxy h4 -arg '-dW' -conf { +haproxy h4 -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 6e0e563843..fff0ae398e 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 -arg '-dW' -conf { +haproxy h1 -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 59bb8837d3..3b1d8198e3 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 -arg '-dW' -conf { +haproxy h1 -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 aaad3e3827..8206da3552 100644 --- a/reg-tests/converter/fix.vtc +++ b/reg-tests/converter/fix.vtc @@ -53,7 +53,7 @@ server s2 { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 ec30f7c9a5..13729f650c 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 -arg '-dW' -conf { +haproxy h1 -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 0dda7b6077..f412daf5cb 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 -arg '-dW' -conf { +haproxy h1 -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 1941fa3bdc..1f37c9f1f7 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 -arg '-dW' -conf { +haproxy h1 -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 7e5e930476..f4e3bb203c 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 -arg '-dW' -conf { +haproxy h1 -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 93956a8f49..fc3dacae14 100644 --- a/reg-tests/converter/mqtt.vtc +++ b/reg-tests/converter/mqtt.vtc @@ -55,7 +55,7 @@ server s2 { sendhex "20250000221100000078217fff24012501270000ffff22000a2600016100016226000163000164" } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 6e1ff62a2e..1633603823 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 -arg '-dW' -conf { +haproxy h1 -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 40ea1d7aee..dfda40ec37 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 -arg '-dW' -conf { +haproxy h1 -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 81f5e7d7a0..b10e45e54b 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 -arg '-dW' -conf { +haproxy h1 -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 67a6384549..d5e317bb2c 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 -arg '-dW' -conf { +haproxy h1 -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 e9b57082c9..74acac8ff1 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 -arg '-dW' -conf { +haproxy h1 -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 2659c901fc..acd46781f5 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 -arg '-dW' -conf { +haproxy h1 -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 3cdc20d463..abb2bccfa4 100644 --- a/reg-tests/filters/random-forwarding.vtc +++ b/reg-tests/filters/random-forwarding.vtc @@ -48,7 +48,7 @@ server s1 { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 58e8befa1d..1ae210b65c 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 -arg '-dW' -conf { +haproxy h -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 692fa2ae4b..6b86360ad7 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 -arg '-dW' -conf { +haproxy h1 -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 053b978add..f5ae9b9732 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 -arg '-dW' -conf { +haproxy h1 -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 54621f8b62..1ace744fad 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 -arg '-dW' -conf { +haproxy h1 -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 7053b36a31..6d82f28280 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 -arg '-dW' -conf { +haproxy h1 -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 290fa6b827..befec708e2 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 -arg '-dW' -conf { +haproxy h1 -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 2f6e7d6ba7..4bc2276741 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 -arg '-dW' -conf { +haproxy h1 -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 74e8563f09..b7750501c8 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 -arg '-dW' -conf { +haproxy h1 -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 4efb655dda..909d525094 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 -arg '-dW' -conf { +haproxy h1 -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 768dfb8416..63e194ae3e 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 -arg '-dW' -conf { +haproxy h1 -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 10c0594767..67aba14409 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 -arg '-dW' -conf { +haproxy h1 -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 7e17972e6f..c638f7d5b0 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 -arg '-dW' -conf { +haproxy hap -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 4071402110..637b664866 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 -arg '-dW' -conf { +haproxy h1 -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 6a52b9da4a..ea57f3d6be 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 -arg '-dW' -conf { +haproxy h1 -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 -arg '-dW' -conf { } -start -haproxy h2 -arg '-dW' -conf { +haproxy h2 -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 9ecb078ff0..6b53bc4f47 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 -arg '-dW' -conf { +haproxy h1 -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 177d0c2499..73916f2241 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 -arg '-dW' -conf { +haproxy h1 -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 603f8ab905..f02666f1f8 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 -arg '-dW' -conf { +haproxy h1 -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 5a70577486..302db4ab4e 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 -arg '-dW' -conf { +haproxy h1 -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 bed2123499..e86680bd55 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 -arg '-dW' -conf { +haproxy h1 -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 d0333e379e..e2e9f32ddd 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 -arg '-dW' -conf { +haproxy h1 -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 26532fe178..322dfe29ac 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 -arg '-dW' -conf { +haproxy h1 -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 01110db6f8..a9f819117e 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 -arg '-dW' -conf { +haproxy h1 -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 ba49fcc0e7..46c98481ba 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 -arg '-dW' -conf { +haproxy hap -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 3a8c1586da..3edbafbd10 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 -arg '-dW' -conf { +haproxy h1 -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 feae4a4863..9969813334 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 -arg '-dW' -conf { +haproxy hapsrv -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -37,7 +37,7 @@ haproxy hapsrv -arg '-dW' -conf { } -start # haproxy LB -haproxy hap -arg '-dW' -conf { +haproxy hap -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 bd364de041..e674b87268 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 -arg '-dW' -conf { +haproxy h1 -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 44c89ceccc..aed55fe515 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 -arg '-dW' -conf { +haproxy hap_srv -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -69,7 +69,7 @@ haproxy hap_srv -arg '-dW' -conf { # haproxy instance used as a server # generate a http/1.1 websocket response with an invalid key -haproxy hap_srv_bad_key -arg '-dW' -conf { +haproxy hap_srv_bad_key -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -89,7 +89,7 @@ haproxy hap_srv_bad_key -arg '-dW' -conf { http-after-response set-status 101 if { status eq 200 } } -start -haproxy hap -arg '-dW' -conf { +haproxy hap -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 82829a15fd..81b7b0dcf4 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 -arg '-dW' -conf { +haproxy h1 -W -S -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 c250a5061a..f19b7c148b 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 -arg '-dW' -conf { +haproxy h1 -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -131,7 +131,7 @@ haproxy h1 -arg '-dW' -conf { } -start # concat,strcmp,word,field haproxy -haproxy h2 -arg '-dW' -conf { +haproxy h2 -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 1e35535698..cc726ab08f 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 -arg '-dW' -conf { +haproxy h1 -conf { defaults common mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -57,7 +57,7 @@ haproxy h1 -arg '-dW' -conf { } -start -haproxy h2 -arg '-dW' -conf { +haproxy h2 -conf { defaults common mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -92,7 +92,7 @@ haproxy h2 -arg '-dW' -conf { } -start -haproxy h3 -arg '-dW' -conf { +haproxy h3 -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 964adf5985..0f74a606e1 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 -arg '-dW' -conf { +haproxy h1 -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 e1834190ac..a859160423 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 -arg '-dW' -conf { +haproxy h1 -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 11b34f2cdb..dd2c6e3fd0 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 -arg '-dW' -conf { +haproxy h1 -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 -arg '-dW' -conf { } -start #test: "default" and "no option forwarded" -haproxy h2 -arg '-dW' -conf { +haproxy h2 -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 a9b1e2d27c..89ae0f6a6f 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 -arg '-dW' -conf { +haproxy h1 -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 a7ba71741a..6d8f9ea3e8 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 -arg '-dW' -conf { +haproxy h1 -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 90e8afaf94..871cc27730 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 -arg '-dW' -conf { +haproxy h1 -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 91ba4e55d8..ea4e95672e 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 -arg '-dW' -conf { +haproxy h1 -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 de4d35451c..a743b10b4e 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 -arg '-dW' -conf { +haproxy h1 -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 ee06330456..923d19fa58 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 -arg '-dW' -conf { +haproxy h1 -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 b00b1361ef..e8ed033639 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 -arg '-dW' -conf { +haproxy h1 -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 e1e6ba66ea..c3b21fbde7 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 -arg '-dW' -conf { +haproxy h1 -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 31481aa774..0a9063050a 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 -arg '-dW' -conf { +haproxy h1 -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 06d6303eaf..971cbe2d5d 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 -arg '-dW' -conf { +haproxy h1 -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 80832609b8..4b26e33c67 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 -arg '-dW' -conf { +haproxy h1 -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 684324db87..89a4548f7e 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 -arg '-dW' -conf { +haproxy h1 -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 360cb2d86d..a112bc51e0 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 -arg '-dW' -conf { +haproxy hap -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 e1bd5578c6..57a2ee2397 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 -arg '-dW' -conf { +haproxy h1 -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 27a4b6e864..f2b89e4918 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 -arg '-dW' -conf { +haproxy h1 -conf { global nbthread 1 diff --git a/reg-tests/log/load_balancing.vtc b/reg-tests/log/load_balancing.vtc index 6b3299463c..5c56e653dc 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 -arg '-dW' -conf { +haproxy h1 -conf { global nbthread 1 diff --git a/reg-tests/log/log_backend.vtc b/reg-tests/log/log_backend.vtc index 02c5277cce..a9223ee01a 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 -arg '-dW' -conf { +haproxy h1 -conf { defaults mode http option httplog diff --git a/reg-tests/log/log_forward.vtc b/reg-tests/log/log_forward.vtc index 87e55afb09..3977f4ca5d 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 -arg '-dW' -conf { +haproxy h1 -conf { defaults mode http option httplog diff --git a/reg-tests/log/log_profiles.vtc b/reg-tests/log/log_profiles.vtc index 5e9fe34ce3..0aeb338d4d 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 -arg '-dW' -conf { +haproxy h1 -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 0bddfe3472..6dd50d2fac 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 -arg '-dW' -conf { +haproxy h1 -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 914b23fdba..44312af9fe 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 -arg '-dW' -conf { +haproxy h1 -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 037a3f5fee..5cfdf1a7e6 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 -arg '-dW' -conf { +haproxy h1 -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 73a1b3d462..7bed3fd8e5 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 -arg '-dW' -conf { +haproxy h1 -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 1680dc9cd0..0a846af595 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 -arg '-dW' -conf { +haproxy h1 -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 b148bb1120..11c7d629ba 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 -arg '-dW' -conf { +haproxy h1 -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 bce63308e4..bf53b52817 100644 --- a/reg-tests/lua/lua_httpclient.vtc +++ b/reg-tests/lua/lua_httpclient.vtc @@ -36,7 +36,7 @@ server s3 { } -start -haproxy h1 -arg '-dW' -conf { +haproxy h1 -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 a3b1308da8..3d0cd15727 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 -arg '-dW' -conf { +haproxy h1 -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 01c0bb1fb3..51b5dfc512 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 -arg '-dW' -conf { +haproxy h1 -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 ada62cf10e..3cf79bdfb1 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 -arg '-dW' -conf { +haproxy h1 -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 1e83b58cb6..e370d098fc 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 -arg '-dW' -conf { +haproxy h1 -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 efafa11c06..995d42624d 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 -arg '-dW' -conf { +haproxy h1 -conf { global lua-load ${testdir}/wrong_types_usage.lua diff --git a/reg-tests/mailers/healthcheckmail.vtc b/reg-tests/mailers/healthcheckmail.vtc index 36f7ecc268..208d350f6f 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 -arg '-dW' -conf { +haproxy h1 -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 3c6ed6bbc1..147ff0dc7d 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 -arg '-dW' -conf { +haproxy h1 -W -S -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 4d22c367bd..276488a1b8 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 -arg '-dW' -conf { +haproxy h1 -W -S -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 67589cf9da..5c0cb4117c 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -25,7 +25,7 @@ haproxy h1 -arg "-L A" -arg '-dW' -conf { tcp-request content sc-inc-gpc0(0) } -haproxy h2 -arg "-L B" -arg '-dW' -conf { +haproxy h2 -arg "-L B" -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -47,7 +47,7 @@ haproxy h2 -arg "-L B" -arg '-dW' -conf { http-request sc-inc-gpc0(0) } -haproxy h3 -arg "-L C" -arg '-dW' -conf { +haproxy h3 -arg "-L C" -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 d2df63f322..9f97ff54e5 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -24,7 +24,7 @@ haproxy h1 -arg "-L A" -arg '-dW' -conf { tcp-request content sc-inc-gpc0(0) } -haproxy h2 -arg "-L B" -arg '-dW' -conf { +haproxy h2 -arg "-L B" -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -44,7 +44,7 @@ haproxy h2 -arg "-L B" -arg '-dW' -conf { http-request sc-inc-gpc0(0) } -haproxy h3 -arg "-L C" -arg '-dW' -conf { +haproxy h3 -arg "-L C" -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 45023883a1..95e3d736e3 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -28,7 +28,7 @@ haproxy h1 -arg "-L A" -arg '-dW' -conf { tcp-request content sc-inc-gpc0(0) } -haproxy h2 -arg "-L B" -arg '-dW' -conf { +haproxy h2 -arg "-L B" -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -52,7 +52,7 @@ haproxy h2 -arg "-L B" -arg '-dW' -conf { http-request sc-inc-gpc0(0) } -haproxy h3 -arg "-L C" -arg '-dW' -conf { +haproxy h3 -arg "-L C" -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -76,7 +76,7 @@ haproxy h3 -arg "-L C" -arg '-dW' -conf { http-request sc-inc-gpc0(0) } -haproxy h4 -arg "-L D" -arg '-dW' -conf { +haproxy h4 -arg "-L D" -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 9f17cd493a..bf467084b8 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -conf { defaults timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -26,7 +26,7 @@ haproxy h1 -arg "-L A" -arg '-dW' -conf { tcp-request content sc-inc-gpc0(0) } -haproxy h2 -arg "-L B" -arg '-dW' -conf { +haproxy h2 -arg "-L B" -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -48,7 +48,7 @@ haproxy h2 -arg "-L B" -arg '-dW' -conf { http-request sc-inc-gpc0(0) } -haproxy h3 -arg "-L C" -arg '-dW' -conf { +haproxy h3 -arg "-L C" -conf { defaults mode http timeout client "${HAPROXY_TEST_TIMEOUT-5s}" @@ -70,7 +70,7 @@ haproxy h3 -arg "-L C" -arg '-dW' -conf { http-request sc-inc-gpc0(0) } -haproxy h4 -arg "-L D" -arg '-dW' -conf { +haproxy h4 -arg "-L D" -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 9571da9239..21e6f4b524 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 -arg '-dW' -conf { +haproxy h1 -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 b370f58467..82961e1007 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 -arg '-dW' -conf { +haproxy h1 -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 65a526742c..c1d26ada82 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 -arg '-dW' -conf { +haproxy h1 -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 -arg '-dW' -conf { +haproxy h2 -conf { defaults timeout client 30s timeout server 30s @@ -83,7 +83,7 @@ server s3 { txresp } -start -haproxy h3 -arg '-dW' -conf { +haproxy h3 -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 -arg '-dW' -conf { +haproxy h4 -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 7eb815c43f..2c2f60d934 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 -arg '-dW' -conf { +haproxy h1 -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 4497c0fd11..eea17b188f 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 -arg '-dW' -conf { +haproxy h1 -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 c0548e89ac..08233aac7b 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 -arg '-dW' -conf { +haproxy h1 -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 ecd548b02b..e21c542c0e 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 -arg '-dW' -conf { +haproxy h1 -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 193129c655..9312b1df91 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 -arg '-dW' -conf { +haproxy h1 -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 0a703cf9aa..26fe02e820 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 -arg '-dW' -conf { +haproxy h1 -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 00aed387fc..29d474cf2c 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 -arg '-dW' -conf { +haproxy h1 -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 807e5da396..3686a1f65f 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 -arg '-dW' -conf { +haproxy h1 -W -S -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 72566a270c..164d17274c 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 -arg '-dW' -conf { +haproxy h1 -W -S -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 59fcd90bb3..e5b26d76bd 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 -arg '-dW' -conf { +haproxy h1 -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 c01bd1888b..8c29305e74 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 -arg '-dW' -conf { +haproxy h1 -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 732ee4e2ea..48faee13cc 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 -arg '-dW' -conf { +haproxy h1 -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 694aec3011..2377fb2e48 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 -arg '-dW' -conf { +haproxy h1 -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 72491f0bc3..e66764164c 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 -arg '-dW' -conf { +haproxy h1 -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 8754d19967..61d241c2af 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 -arg '-dW' -conf { +haproxy h1 -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 4acfe65171..f82674f30e 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 -arg '-dW' -conf { +haproxy h1 -conf { defaults mode http timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" @@ -24,7 +24,7 @@ haproxy h1 -arg '-dW' -conf { server www1 ${s1_addr}:${s1_port} } -start -haproxy h2 -arg '-dW' -conf { +haproxy h2 -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 56ef3f2836..fa6fe68c5d 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 -arg '-dW' -conf { +haproxy h1 -conf { global ssl-server-verify none diff --git a/reg-tests/spoe/wrong_init.vtc b/reg-tests/spoe/wrong_init.vtc index e128fb6896..152622c5e4 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 -arg '-dW' -conf-BAD {} { +haproxy h1 -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 02e85dd5e3..6c6379ec33 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 -arg '-dW' -conf { +haproxy h1 -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 977c824c54..a07ec4e2a2 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 -arg '-dW' -conf-OK { +haproxy h1 -arg -V -conf-OK { crt-store load crt "${testdir}/common.crt" key "${testdir}/common.key" @@ -24,7 +24,7 @@ haproxy h1 -arg -V -arg '-dW' -conf-OK { } -haproxy h2 -arg -V -arg '-dW' -conf-BAD {} { +haproxy h2 -arg -V -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 cb1bfb3d0e..3a2beccb64 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 -arg '-dW' -conf { +haproxy h1 -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 d85c586f75..b7730f5583 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 -arg '-dW' -conf { +haproxy h1 -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 84539ad317..9fa90673f6 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 -arg '-dW' -conf { +haproxy h1 -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 2f61bd07f8..6b7515bf87 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 -arg '-dW' -conf { +haproxy h1 -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 3d7d5e0606..7e8a9f19d0 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 -arg '-dW' -conf { +haproxy h1 -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 8164f8a818..8575f26449 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 -arg '-dW' -conf { +haproxy h1 -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 2908d495d7..bcaf96b19b 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 -arg '-dW' -conf { +haproxy h1 -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 -arg '-dW' -conf { +haproxy h2 -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 -arg '-dW' -conf { +haproxy h3 -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 -arg '-dW' -conf { +haproxy h4 -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 -arg '-dW' -conf { +haproxy h5 -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 -arg '-dW' -conf { +haproxy h6 -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 -arg '-dW' -conf { +haproxy h7 -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 -arg '-dW' -conf { +haproxy h8 -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 -arg '-dW' -conf { +haproxy h9 -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 d43198b6ea..c773f134ca 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 -arg '-dW' -conf { +haproxy h1 -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 feaf34489a..2e5aebbdaa 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 -arg '-dW' -conf { +haproxy h1 -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 b94af0ff56..6373498dee 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 -arg '-dW' -conf { +haproxy h1 -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 35941e6792..3b3c0b343a 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 -arg '-dW' -conf { +haproxy h1 -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 3ab740e6c8..ed5fdb5c73 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 -arg '-dW' -conf { +haproxy h1 -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 01e2cdf4f1..86cab00173 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 -arg '-dW' -conf { +haproxy h1 -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 2602b97e9c..55d8df0efa 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 -arg '-dW' -conf { +haproxy h1 -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 2351537627..08969ba2b3 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 -arg '-dW' -conf { +haproxy h1 -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 889860c525..9d032769c8 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 -arg '-dW' -conf { +haproxy h1 -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 3f7f085a6a..a223a9c18b 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 -arg '-dW' -conf { +haproxy h1 -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 aa3995e864..6b770822c9 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 -arg '-dW' -conf { +haproxy h1 -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 f6c87da85e..843d85af47 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 -arg '-dW' -conf { +haproxy h1 -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 6d08ccaaa7..551679177e 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 -arg '-dW' -conf { +haproxy h1 -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 9c4d5ec575..5ffd2d8bdf 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 -arg '-dW' -conf { +haproxy h1 -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 3f4116d30c..88a3ccbe4d 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 -arg '-dW' -conf { +haproxy h1 -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 a76a7c941e..5fe7c88aa2 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 -arg '-dW' -conf { +haproxy h1 -conf { global stats socket "${tmpdir}/h1/stats" level admin @@ -65,7 +65,7 @@ haproxy h1 -arg '-dW' -conf { server s1 ${s1_addr}:${s1_port} } -start -haproxy h2 -arg '-dW' -conf { +haproxy h2 -conf { global stats socket "${tmpdir}/h2/stats" level admin @@ -92,7 +92,7 @@ haproxy h2 -arg '-dW' -conf { server s1 ${s1_addr}:${s1_port} } -start -haproxy h3 -arg '-dW' -conf { +haproxy h3 -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 93683d8a69..a3c54553c6 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 -arg '-dW' -conf { +haproxy h1 -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 97dab56e94..56a208bccd 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 -arg '-dW' -conf { +haproxy h1 -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 2cef988818..ace27d877b 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 -arg '-dW' -conf { +haproxy h1 -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 a310be8f07..d7244eeb4d 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 -arg '-dW' -conf { +haproxy h1 -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 9fc7422b2c..2841d1cc63 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 -arg '-dW' -conf { +haproxy h1 -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 0f56bad230..d70327b0b1 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 -arg '-dW' -conf { +haproxy h1 -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 73316afc78..4275731fe6 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 -arg '-dW' -conf { +haproxy h1 -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 501bb561c4..0173916198 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" -arg '-dW' -conf { +haproxy h1 -arg "-m 1024" -conf { } -start haproxy h1 -cli { @@ -26,7 +26,7 @@ haproxy h1 -cli { expect ~ ".*Maxconn: (29000|28000)\n.*" } -haproxy h2 -arg "-m 384" -arg '-dW' -conf { +haproxy h2 -arg "-m 384" -conf { } -start haproxy h2 -cli { @@ -34,7 +34,7 @@ haproxy h2 -cli { expect ~ ".*Maxconn: (11000|10000)\n.*" } -haproxy h3 -arg "-m 256" -arg '-dW' -conf { +haproxy h3 -arg "-m 256" -conf { } -start haproxy h3 -cli { @@ -44,7 +44,7 @@ haproxy h3 -cli { # 1 SSL front but no back -haproxy h4 -arg "-m 256" -arg '-dW' -conf { +haproxy h4 -arg "-m 256" -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" -arg '-dW' -conf { +haproxy h5 -arg "-m 256" -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" -arg '-dW' -conf { +haproxy h6 -arg "-m 256" -conf { defaults mode http timeout connect 1s diff --git a/reg-tests/startup/default_rules.vtc b/reg-tests/startup/default_rules.vtc index 89a9259bd2..654e9cf3db 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 -arg '-dW' -conf-BAD {} { +haproxy h1 -conf-BAD {} { defaults http-request set-header X-Hdr 1 } -haproxy h2 -arg '-dW' -conf-BAD {} { +haproxy h2 -conf-BAD {} { defaults http-response set-header X-Hdr 1 } -haproxy h3 -arg '-dW' -conf-BAD {} { +haproxy h3 -conf-BAD {} { defaults http-after-request set-header X-Hdr 1 } -haproxy h4 -arg '-dW' -conf-BAD {} { +haproxy h4 -conf-BAD {} { defaults tcp-request connection accept } -haproxy h5 -arg '-dW' -conf-BAD {} { +haproxy h5 -conf-BAD {} { defaults tcp-request session accept } -haproxy h6 -arg '-dW' -conf-BAD {} { +haproxy h6 -conf-BAD {} { defaults tcp-request inspect-delay 5s tcp-request content accept } -haproxy h7 -arg '-dW' -conf-BAD {} { +haproxy h7 -conf-BAD {} { defaults tcp-response inspect-delay 5s tcp-response content accept @@ -47,7 +47,7 @@ haproxy h7 -arg '-dW' -conf-BAD {} { # defaults section defining TCP/HTTP rules cannot be used to init another # defaults section # -haproxy h8 -arg '-dW' -conf-BAD {} { +haproxy h8 -conf-BAD {} { defaults invalid tcp-response inspect-delay 5s tcp-response content accept @@ -60,7 +60,7 @@ haproxy h8 -arg '-dW' -conf-BAD {} { # defaults section defining TCP/HTTP rules cannot be used to init a listen # section # -haproxy h9 -arg '-dW' -conf-BAD {} { +haproxy h9 -conf-BAD {} { defaults invalid tcp-request inspect-delay 5s tcp-request content accept @@ -76,7 +76,7 @@ haproxy h9 -arg '-dW' -conf-BAD {} { # backend sections at the same time # # -haproxy h10 -arg '-dW' -conf-BAD {} { +haproxy h10 -conf-BAD {} { defaults invalid tcp-request inspect-delay 5s tcp-request content accept @@ -95,7 +95,7 @@ haproxy h10 -arg '-dW' -conf-BAD {} { # defaults section defining 'tcp-request connection' or 'tcp-request session' # rules cannot be used to init backend sections # -haproxy h11 -arg '-dW' -conf-BAD {} { +haproxy h11 -conf-BAD {} { defaults invalid tcp-request connection accept @@ -104,7 +104,7 @@ haproxy h11 -arg '-dW' -conf-BAD {} { server www 127.0.0.1:80 } -haproxy h12 -arg '-dW' -conf-BAD {} { +haproxy h12 -conf-BAD {} { defaults invalid tcp-request session accept @@ -117,7 +117,7 @@ haproxy h12 -arg '-dW' -conf-BAD {} { # defaults section defining 'tcp-response content' rules cannot be used to init # a frontend section # -haproxy h13 -arg '-dW' -conf-BAD {} { +haproxy h13 -conf-BAD {} { defaults invalid tcp-response inspect-delay 5s tcp-response content accept @@ -127,7 +127,7 @@ haproxy h13 -arg '-dW' -conf-BAD {} { bind "fd@${feh10}" } -haproxy h14 -arg -V -arg '-dW' -conf-OK { +haproxy h14 -arg -V -conf-OK { defaults tcp timeout client 30s timeout server 30s @@ -145,7 +145,7 @@ haproxy h14 -arg -V -arg '-dW' -conf-OK { # SRV/TAB arguments without an explicit proxy name are not allowed. # -haproxy h15 -arg '-dW' -conf-BAD {} { +haproxy h15 -conf-BAD {} { defaults invalid mode http http-request set-header x-test "%[srv_conn(www)]" @@ -154,7 +154,7 @@ haproxy h15 -arg '-dW' -conf-BAD {} { server www 127.0.0.1:80 } -haproxy h16 -arg '-dW' -conf-BAD {} { +haproxy h16 -conf-BAD {} { defaults invalid mode http http-request track-sc0 src @@ -165,7 +165,7 @@ haproxy h16 -arg '-dW' -conf-BAD {} { server www 127.0.0.1:80 } -haproxy h17 -arg -V -arg '-dW' -conf-OK { +haproxy h17 -arg -V -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 c69c53f413..533765fc61 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 -arg '-dW' -conf { +haproxy h1 -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 2b6903417e..bdf8869bee 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 -arg '-dW' -conf { +haproxy h0 -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 d7a69136e4..f0307cb210 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 -arg '-dW' -conf { +haproxy h0 -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 d346991830..23c9a9afd1 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" @@ -104,7 +104,7 @@ server s8 { } -repeat 2 -start -haproxy h2 -arg "-L B" -arg '-dW' -conf { +haproxy h2 -arg "-L B" -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 675a0d59f1..0dc1148f9c 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" -arg '-dW' -conf { +haproxy h1 -arg "-L A" -conf { defaults mode http timeout server "${HAPROXY_TEST_TIMEOUT-5s}" @@ -73,7 +73,7 @@ haproxy h1 -arg "-L A" -arg '-dW' -conf { bind "fd@${fe}" } -haproxy h2 -arg "-L B" -arg '-dW' -conf { +haproxy h2 -arg "-L B" -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 7a48ffdec5..fc91f257d0 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 -arg '-dW' -conf { +haproxy h1 -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 0bd4f833c4..0607b2a4fa 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 -arg '-dW' -conf { +haproxy h1 -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 b8a9d868d6..8c05f4306b 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 -arg '-dW' -conf { +haproxy h1 -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 e27201caea..8b292c3865 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 -arg '-dW' -conf { +haproxy h1 -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 7f477b2c56..7830ae5b45 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 -arg '-dW' -conf { +haproxy h1 -conf { global # WT: limit false-positives causing "HTTP header incomplete" due to # idle server connections being randomly used and randomly expiring diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh index 79dd8e9d8b..5511516758 100755 --- a/scripts/run-regtests.sh +++ b/scripts/run-regtests.sh @@ -312,7 +312,7 @@ _version() { HAPROXY_PROGRAM="${HAPROXY_PROGRAM:-${PWD}/haproxy}" -HAPROXY_ARGS="${HAPROXY_ARGS--dM -dI}" +HAPROXY_ARGS="${HAPROXY_ARGS--dM -dI -dW}" VTEST_PROGRAM="${VTEST_PROGRAM:-vtest}" VTEST_TIMEOUT="${VTEST_TIMEOUT:-10}" TESTDIR="${TMPDIR:-/tmp}"