REGTESTS: restrict execution to a single thread group

When threads are enabled and running on a machine with multiple CCX
or multiple nodes, thread groups are now enabled since 3.3-dev2, causing
load-balancing algorithms to randomly fail due to incoming connections
spreading over multiple groups and using different load balancing indexes.

Let's just force "thread-groups 1" into all configs when threads are
enabled to avoid this.

reg-tests/balance/balance-hash-maxconn.vtc

@@ -21,6 +21,11 @@ server s1 {
 } -start
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/balance/balance-hash-maxqueue.vtc

@@ -47,6 +47,11 @@ server s1 {
 } -start
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/balance/balance-rr.vtc

@@ -22,6 +22,11 @@ server s4 {
 } -repeat 2 -start
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/balance/balance-uri-path-only.vtc

@@ -22,6 +22,11 @@ server s4 {
 } -repeat 5 -start
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/balance/balance-uri.vtc

@@ -22,6 +22,11 @@ server s4 {
 } -repeat 2 -start
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/cache/basic.vtc

@@ -23,6 +23,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/cache/caching_rules.vtc

@@ -113,6 +113,10 @@ server s2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/cache/expires.vtc

@@ -39,6 +39,10 @@ server s3 {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                # WT: limit false-positives causing "HTTP header incomplete" due to
                # idle server connections being randomly used and randomly expiring
                # under us.

reg-tests/cache/if-modified-since.vtc

@@ -39,6 +39,10 @@ server s1 {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                # WT: limit false-positives causing "HTTP header incomplete" due to
                # idle server connections being randomly used and randomly expiring
                # under us.

reg-tests/cache/if-none-match.vtc

@@ -24,6 +24,10 @@ server s1 {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                # WT: limit false-positives causing "HTTP header incomplete" due to
                # idle server connections being randomly used and randomly expiring
                # under us.

reg-tests/cache/post_on_entry.vtc

@@ -21,6 +21,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
                mode http
                timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/cache/sample_fetches.vtc

@@ -43,6 +43,10 @@ server s3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/cache/vary.vtc

@@ -165,6 +165,10 @@ server s2 {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                # WT: limit false-positives causing "HTTP header incomplete" due to
                # idle server connections being randomly used and randomly expiring
                # under us.

reg-tests/cache/vary_accept_encoding.vtc

@@ -91,6 +91,10 @@ server s1 {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                # WT: limit false-positives causing "HTTP header incomplete" due to
                # idle server connections being randomly used and randomly expiring
                # under us.

reg-tests/checks/1be_40srv_odd_health_checks.vtc

@@ -56,6 +56,11 @@ server s38 {} -start
 server s39 {} -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/40be_2srv_odd_health_checks.vtc

@@ -238,6 +238,11 @@ server s37 {} -start
 server s39 {} -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/4be_1srv_health_checks.vtc

@@ -92,6 +92,11 @@ syslog S4 -level notice {
 
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
         timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc

@@ -55,6 +55,11 @@ server s2 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/agent-check.vtc

@@ -15,6 +15,11 @@ server s1 {
 
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/http-check-expect.vtc

@@ -24,6 +24,11 @@ syslog S1 -level notice {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/http-check-send.vtc

@@ -108,6 +108,11 @@ syslog S6 -level notice {
 
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/http-check.vtc

@@ -90,6 +90,11 @@ syslog S1 -level notice {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/http-monitor-uri.vtc

@@ -7,6 +7,11 @@ varnishtest "Test the HTTP directive monitor-uri"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/ldap-check.vtc

@@ -50,6 +50,11 @@ syslog S4 -level notice {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/mysql-check.vtc

@@ -63,6 +63,11 @@ syslog S5 -level notice {
 
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/pgsql-check.vtc

@@ -48,6 +48,11 @@ syslog S4 -level notice {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/redis-check.vtc

@@ -29,6 +29,11 @@ syslog S2 -level notice {
 
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/smtp-check.vtc

@@ -64,6 +64,11 @@ syslog S5 -level notice {
 
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/spop-check.vtc

@@ -48,6 +48,11 @@ syslog S4 -level notice {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/ssl-hello-check.vtc

@@ -24,6 +24,10 @@ syslog S3 -level notice {
 
 haproxy htst -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

reg-tests/checks/tcp-check-client-hello.vtc

@@ -16,6 +16,10 @@ syslog S_ok -level notice {
 
 haproxy htst -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         ssl-default-bind-options ssl-min-ver TLSv1.2 ssl-max-ver TLSv1.3
 
     defaults

reg-tests/checks/tcp-check-ssl.vtc

@@ -29,6 +29,10 @@ syslog S4 -level notice {
 
 haproxy htst -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

reg-tests/checks/tcp-check_min-recv.vtc

@@ -30,6 +30,11 @@ server s2 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   defaults
     mode tcp
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/tcp-check_multiple_ports.vtc

@@ -19,6 +19,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   defaults
     mode tcp
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/tcp-checks-socks4.vtc

@@ -30,6 +30,11 @@ syslog S1 -level notice {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/checks/tls_health_checks.vtc

@@ -34,6 +34,10 @@ syslog S1 -level notice {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif
@@ -85,6 +89,10 @@ syslog S6 -level notice {
 
 haproxy h2 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

reg-tests/compression/basic.vtc

@@ -177,6 +177,11 @@ server s1 {
 
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/compression/etags_conversion.vtc

@@ -106,6 +106,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/compression/lua_validation.vtc

@@ -8,6 +8,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	tune.lua.bool-sample-conversion normal
 	lua-load		${testdir}/lua_validation.lua
 

reg-tests/compression/min_size.vtc

@@ -56,6 +56,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/compression/vary.vtc

@@ -111,6 +111,10 @@ server s2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/connection/cli_src_dst.vtc

@@ -4,6 +4,11 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/connection/dispatch.vtc

@@ -13,6 +13,10 @@ server s2 {
 
 haproxy h1 -conf {
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     # this is needed since 3.3, and this test will be removed in 3.5.
     expose-deprecated-directives
 

reg-tests/connection/h2_glitches.vtc

@@ -6,6 +6,11 @@ feature ignore_unknown_macro
 
 # haproxy frontend
 haproxy hap -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		timeout client 30s
 		timeout server 30s

reg-tests/connection/http_reuse_aggressive.vtc

@@ -3,6 +3,11 @@ varnishtest "Test the http-reuse aggressive mode"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		timeout client 30s
 		timeout server 30s

reg-tests/connection/http_reuse_always.vtc

@@ -4,6 +4,11 @@ varnishtest "Test the http-reuse always mode"
 feature ignore_unknown_macro
 
 haproxy h1 -Ws -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		timeout client 30s
 		timeout server 30s

reg-tests/connection/http_reuse_be_transparent.vtc

@@ -9,6 +9,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
 	global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 		nbthread 1
 
 	defaults

reg-tests/connection/http_reuse_conn_hash.vtc

@@ -4,6 +4,11 @@ varnishtest "Test the http-reuse with special connection parameters"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		timeout client 30s
 		timeout server 30s

reg-tests/connection/http_reuse_dispatch.vtc

@@ -8,6 +8,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
 	global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 		nbthread 1
 
 	defaults

reg-tests/connection/http_reuse_never.vtc

@@ -3,6 +3,11 @@ varnishtest "Test the http-reuse never mode"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		timeout client 30s
 		timeout server 30s

reg-tests/connection/http_reuse_safe.vtc

@@ -3,6 +3,11 @@ varnishtest "Test the http-reuse safe mode"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		timeout client 30s
 		timeout server 30s

reg-tests/connection/proxy_protocol_random_fail.vtc

@@ -24,6 +24,10 @@ syslog Slog_1 -repeat 8 -level info {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

reg-tests/connection/proxy_protocol_send_generic.vtc

@@ -3,6 +3,11 @@ varnishtest "Check that generic TLV IDs are sent properly"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         log global
@@ -42,6 +47,11 @@ client c1 -connect ${h1_feS_sock} {
 
 # Ensure that we achieve the same via a default-server.
 haproxy h2 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         log global

reg-tests/connection/proxy_protocol_send_unique_id.vtc

@@ -3,6 +3,11 @@ varnishtest "Check that the unique ID TLV is properly sent"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	timeout client 30s
 	timeout server 30s

reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc

@@ -5,6 +5,11 @@ varnishtest "Check that the unique ID TLV is properly sent for servers with ALPN
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	timeout client 30s
 	timeout server 30s

reg-tests/connection/proxy_protocol_tlv_validation.vtc

@@ -6,6 +6,11 @@ feature ignore_unknown_macro
 # the client is reused, leading to connection resets.
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -39,6 +44,11 @@ client c1 -connect ${h1_fe1_sock} {
 } -run
 
 haproxy h2 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -76,6 +86,11 @@ client c2 -connect ${h2_fe1_sock} {
 } -run
 
 haproxy h3 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -108,6 +123,11 @@ client c3 -connect ${h3_fe1_sock} {
 } -run
 
 haproxy h4 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/connection/reverse_connect_full.vtc

@@ -10,6 +10,10 @@ server s1 {
 
 haproxy h_edge -conf {
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	expose-experimental-directives
 
 defaults
@@ -33,6 +37,10 @@ backend be-reverse
 
 haproxy h_dev -conf {
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	expose-experimental-directives
 
 defaults

reg-tests/connection/reverse_server.vtc

@@ -7,6 +7,10 @@ barrier b1 cond 2
 
 haproxy h_edge -conf {
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	expose-experimental-directives
 
 defaults

reg-tests/connection/reverse_server_name.vtc

@@ -8,6 +8,10 @@ barrier b1 cond 2
 
 haproxy h_edge -conf {
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	expose-experimental-directives
 
 defaults

reg-tests/connection/tcp_to_http_upgrade.vtc

@@ -42,6 +42,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client 30s
         timeout server 30s

reg-tests/contrib/prometheus.vtc

@@ -16,6 +16,11 @@ server s2 {
 }  -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/add_item.vtc

@@ -9,6 +9,11 @@ server s1 {
 } -repeat 3 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/be2dec.vtc

@@ -9,6 +9,11 @@ server s1 {
 } -repeat 3 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/be2hex.vtc

@@ -9,6 +9,11 @@ server s1 {
 } -repeat 3 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/bytes.vtc

@@ -11,6 +11,11 @@ server s1 {
 } -repeat 1 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		mode http
 		timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -98,6 +103,11 @@ client c1 -connect ${h1_fe_sock} {
 # TEST - 2
 # negative starting index causes startup failure
 haproxy h2 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		mode http
 		timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -118,6 +128,11 @@ haproxy h2 -conf {
 # TEST - 3
 # negative length causes startup failure
 haproxy h3 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		mode http
 		timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -138,6 +153,11 @@ haproxy h3 -conf {
 # TEST - 4
 # 0 length causes startup failure
 haproxy h4 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		mode http
 		timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/digest.vtc

@@ -10,6 +10,11 @@ server s1 {
 } -repeat 2 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/field.vtc

@@ -8,6 +8,11 @@ server s1 {
 } -repeat 3 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/fix.vtc

@@ -53,6 +53,11 @@ server s2 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/hmac.vtc

@@ -10,6 +10,11 @@ server s1 {
 } -repeat 2 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/iif.vtc

@@ -8,6 +8,11 @@ server s1 {
 } -repeat 3 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/json.vtc

@@ -9,6 +9,11 @@ server s1 {
 } -repeat 2 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/json_query.vtc

@@ -9,6 +9,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/converter/mqtt.vtc

@@ -55,6 +55,11 @@ server s2 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode tcp
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/param.vtc

@@ -8,6 +8,11 @@ server s1 {
 } -repeat 10 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/secure_memcmp.vtc

@@ -16,6 +16,10 @@ server s2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/converter/sha2.vtc

@@ -10,6 +10,11 @@ server s1 {
 } -repeat 2 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/url_dec.vtc

@@ -9,6 +9,11 @@ server s1 {
 } -repeat 2 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/url_enc.vtc

@@ -8,6 +8,11 @@ server s1 {
 } -repeat 2 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/converter/word.vtc

@@ -8,6 +8,11 @@ server s1 {
 } -repeat 3 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
 	mode http
 	timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/filters/random-forwarding.vtc

@@ -48,6 +48,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/http-capture/multiple_headers.vtc

@@ -39,6 +39,11 @@ server s {
 } -start
 
 haproxy h -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/http-cookies/cookie_insert_indirect.vtc

@@ -23,6 +23,10 @@ server s1 {
 
 haproxy h1 -conf {
 	global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         log ${S1_addr}:${S1_port} len 2048 local0 debug err
 
     defaults

reg-tests/http-cookies/h2_cookie_concat.vtc

@@ -8,6 +8,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		timeout client 30s
 		timeout server 30s

reg-tests/http-errorfiles/errorfiles.vtc

@@ -7,6 +7,11 @@ feature ignore_unknown_macro
 
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/http-errorfiles/http-error.vtc

@@ -5,6 +5,11 @@ varnishtest "Test the http-error directive"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     http-errors errors-1
         errorfile 400  ${testdir}/errors/400-1.http
         errorfile 403  ${testdir}/errors/403-1.http

reg-tests/http-errorfiles/http_deny_errors.vtc

@@ -5,6 +5,11 @@ varnishtest "Test the custom errors for HTTP deny rules"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     http-errors errors-1
         errorfile 400  ${testdir}/errors/400-1.http
         errorfile 403  ${testdir}/errors/403-1.http

reg-tests/http-errorfiles/http_errors.vtc

@@ -5,6 +5,11 @@ varnishtest "Test the errorfiles directive"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     http-errors errors-1
         errorfile 400  ${testdir}/errors/400-1.http
         errorfile 403  ${testdir}/errors/403-1.http

reg-tests/http-errorfiles/http_return.vtc

@@ -6,6 +6,11 @@ varnishtest "Test the HTTP return action with errorfiles"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     http-errors errors-2
         errorfile 400 ${testdir}/errors/400-2.http
 

reg-tests/http-messaging/h1_host_normalization.vtc

@@ -235,6 +235,11 @@ syslog S1 -level info {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/http-messaging/h1_request_target_validation.vtc

@@ -6,6 +6,10 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(3.0-dev0)'"
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/http-messaging/h1_to_h1.vtc

@@ -115,6 +115,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/http-messaging/h2_desync_attacks.vtc

@@ -14,6 +14,11 @@ server s1 {
 
 # haproxy frontend
 haproxy hap -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		timeout client 30s
 		timeout server 30s

reg-tests/http-messaging/h2_to_h1.vtc

@@ -42,6 +42,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/http-messaging/http_abortonclose.vtc

@@ -65,6 +65,10 @@ syslog S2 -level info {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.
@@ -111,6 +115,10 @@ haproxy h1 -conf {
 
 haproxy h2 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/http-messaging/http_bodyless_response.vtc

@@ -30,6 +30,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/http-messaging/http_bodyless_spliced_response.vtc

@@ -34,6 +34,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # WT: limit false-positives causing "HTTP header incomplete" due to
         # idle server connections being randomly used and randomly expiring
         # under us.

reg-tests/http-messaging/http_request_buffer.vtc

@@ -40,6 +40,11 @@ syslog S -level info {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
 	defaults
 		mode http
 		timeout client  100

reg-tests/http-messaging/http_splicing.vtc

@@ -24,6 +24,10 @@ server s2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         log stderr len 4096 local0 debug
 
     defaults

reg-tests/http-messaging/http_splicing_chunk.vtc

@@ -28,6 +28,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         log stderr len 4096 local0 debug
 
     defaults

reg-tests/http-messaging/http_transfer_encoding.vtc

@@ -77,6 +77,11 @@ server s2 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"