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.

diff --git a/reg-tests/balance/balance-hash-maxconn.vtc b/reg-tests/balance/balance-hash-maxconn.vtc
index 2edd797c06e1dc6369dceefa705b62c90f07c880..1453ed34bfaff1b1876ef2a9a7ee89196d0bfa3c 100644 (file)
--- a/reg-tests/balance/balance-hash-maxconn.vtc
+++ b/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}"

diff --git a/reg-tests/balance/balance-hash-maxqueue.vtc b/reg-tests/balance/balance-hash-maxqueue.vtc
index 9f45f80fdfa21a3bb127bb7b27871af29e288527..a27d72f99126a233221517915185c9e87da8cf35 100644 (file)
--- a/reg-tests/balance/balance-hash-maxqueue.vtc
+++ b/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}"

diff --git a/reg-tests/balance/balance-rr.vtc b/reg-tests/balance/balance-rr.vtc
index 908a4f9af32f708149660a681ed8c83ecd596bed..c7ba0a063483516b05e2fba69d5bd4f7ede2298e 100644 (file)
--- a/reg-tests/balance/balance-rr.vtc
+++ b/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}"

diff --git a/reg-tests/balance/balance-uri-path-only.vtc b/reg-tests/balance/balance-uri-path-only.vtc
index 81b9107179ddf98885c8b12ea3db9a3ddeb21594..b7113dad6323cb3185a2d4dceee2607545781c31 100644 (file)
--- a/reg-tests/balance/balance-uri-path-only.vtc
+++ b/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}"

diff --git a/reg-tests/balance/balance-uri.vtc b/reg-tests/balance/balance-uri.vtc
index e67883567bbbeb72873e3ed02597d098c3ce8ce3..3bcdb7b4c3fa003b63ac9bd783eaa1996316688b 100644 (file)
--- a/reg-tests/balance/balance-uri.vtc
+++ b/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}"

diff --git a/reg-tests/cache/basic.vtc b/reg-tests/cache/basic.vtc
index 377cbb379205a0cd92dbca4ed5e366a9f16eb56d..47f7637526247dfcabc22f47770fdb254b7ef08f 100644 (file)
--- a/reg-tests/cache/basic.vtc
+++ b/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}"

diff --git a/reg-tests/cache/caching_rules.vtc b/reg-tests/cache/caching_rules.vtc
index ee85bf25cef58ed7a262e77abe57a541808c4be1..83ab09f5439dae23a7bd0e21052d0889814884ab 100644 (file)
--- a/reg-tests/cache/caching_rules.vtc
+++ b/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.

diff --git a/reg-tests/cache/expires.vtc b/reg-tests/cache/expires.vtc
index d8f94d338e851a7cd820aeece91dfc882d488bf2..d44b4d807e7e90d034b4853d5d30206d56a94ab6 100644 (file)
--- a/reg-tests/cache/expires.vtc
+++ b/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.

diff --git a/reg-tests/cache/if-modified-since.vtc b/reg-tests/cache/if-modified-since.vtc
index 521a555ff8bdff3cd6a2809b5818279e2f95cef4..373190dbee56a1ad0ae0d25e93ae3a4315103e34 100644 (file)
--- a/reg-tests/cache/if-modified-since.vtc
+++ b/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.

diff --git a/reg-tests/cache/if-none-match.vtc b/reg-tests/cache/if-none-match.vtc
index 550b854da45b36460441dfae368bf0515e026c6a..124e7eed4426a1932c3aa9c6671a3d968212257a 100644 (file)
--- a/reg-tests/cache/if-none-match.vtc
+++ b/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.

diff --git a/reg-tests/cache/post_on_entry.vtc b/reg-tests/cache/post_on_entry.vtc
index 0b930ecc4ab3755358932e288c3b6029e4ac1742..06d9aec82fefa5cfa1acffb9e67613c4185ee6ae 100644 (file)
--- a/reg-tests/cache/post_on_entry.vtc
+++ b/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}"

diff --git a/reg-tests/cache/sample_fetches.vtc b/reg-tests/cache/sample_fetches.vtc
index c2b99c20ca579ab8cba72067c55306b34c5052b0..133ef39d98758b7a2a7418e9320e2e41409e4b5d 100644 (file)
--- a/reg-tests/cache/sample_fetches.vtc
+++ b/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.

diff --git a/reg-tests/cache/vary.vtc b/reg-tests/cache/vary.vtc
index 494fe8f0093e316e4c73a9d5856db9697062c608..5a6e6986c18ff0025a642937cb773360e9f28eab 100644 (file)
--- a/reg-tests/cache/vary.vtc
+++ b/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.

diff --git a/reg-tests/cache/vary_accept_encoding.vtc b/reg-tests/cache/vary_accept_encoding.vtc
index c58c106e3e10436ccc750cca103f5199ce06a672..6fe2d6f32f77ee889413e3fd7cfbe02b15d77751 100644 (file)
--- a/reg-tests/cache/vary_accept_encoding.vtc
+++ b/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.

diff --git a/reg-tests/checks/1be_40srv_odd_health_checks.vtc b/reg-tests/checks/1be_40srv_odd_health_checks.vtc
index e4c0ff2625c445a635a7ea82bd30ec6c121d7aa7..09bc70b7877c81c2913c3daef63b2c6c552ea665 100644 (file)
--- a/reg-tests/checks/1be_40srv_odd_health_checks.vtc
+++ b/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}"

diff --git a/reg-tests/checks/40be_2srv_odd_health_checks.vtc b/reg-tests/checks/40be_2srv_odd_health_checks.vtc
index 4d67971ff4b98d23b993ad669e5aecd036ea3e57..49670453622a431e16e6ec72425c33726580733c 100644 (file)
--- a/reg-tests/checks/40be_2srv_odd_health_checks.vtc
+++ b/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}"

diff --git a/reg-tests/checks/4be_1srv_health_checks.vtc b/reg-tests/checks/4be_1srv_health_checks.vtc
index 98f32d79e02d8bc8248cefb799a990e13453a83b..da993d394e7f2385f706c539d8d35107104d79d1 100644 (file)
--- a/reg-tests/checks/4be_1srv_health_checks.vtc
+++ b/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}"

diff --git a/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc b/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
index 58ee9497565f0f869a370592f837964bb9c10e78..770286d3e51f43a8578c34d699aa71d3aa9c6a9c 100644 (file)
--- a/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
+++ b/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}"

diff --git a/reg-tests/checks/agent-check.vtc b/reg-tests/checks/agent-check.vtc
index 5cf51c658e639166053c257dd62bf657b1e15c3f..90b4b64cb88644a0eae68c7c7f9afd056d549406 100644 (file)
--- a/reg-tests/checks/agent-check.vtc
+++ b/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}"

diff --git a/reg-tests/checks/http-check-expect.vtc b/reg-tests/checks/http-check-expect.vtc
index 118eef6d81a9a9244e62279577834b201239945f..c553e15b310ad9535d24367c8322c1293198b195 100644 (file)
--- a/reg-tests/checks/http-check-expect.vtc
+++ b/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}"

diff --git a/reg-tests/checks/http-check-send.vtc b/reg-tests/checks/http-check-send.vtc
index 076aba7f91755fa3e72ffe9a100886d4837e0daf..d0e80ea0107bc51068fad3f7ae98f9912a558869 100644 (file)
--- a/reg-tests/checks/http-check-send.vtc
+++ b/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}"

diff --git a/reg-tests/checks/http-check.vtc b/reg-tests/checks/http-check.vtc
index 31ef87abb0a46a15e256b6bb43b9336d89f6d2ff..22a02901ecedda8dc4b33431e2837da478760c32 100644 (file)
--- a/reg-tests/checks/http-check.vtc
+++ b/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}"

diff --git a/reg-tests/checks/http-monitor-uri.vtc b/reg-tests/checks/http-monitor-uri.vtc
index 26e6e8136b445987215ab61440e43bf289b6d7eb..37c6fed19965d555936172e79fd5608004b16d3e 100644 (file)
--- a/reg-tests/checks/http-monitor-uri.vtc
+++ b/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}"

diff --git a/reg-tests/checks/ldap-check.vtc b/reg-tests/checks/ldap-check.vtc
index 38204bf3b3b7b36154d5ff72f8d5669390dfd423..2329f681ca91d01a23060f80b8f7fa42d22cded0 100644 (file)
--- a/reg-tests/checks/ldap-check.vtc
+++ b/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}"

diff --git a/reg-tests/checks/mysql-check.vtc b/reg-tests/checks/mysql-check.vtc
index 3600138065356751546557cdb3096c127e83721b..f2f64280019c2217ef2b2863b909bed9ed2c1ef4 100644 (file)
--- a/reg-tests/checks/mysql-check.vtc
+++ b/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}"

diff --git a/reg-tests/checks/pgsql-check.vtc b/reg-tests/checks/pgsql-check.vtc
index 5003e7df104d7dbfddf820f1974133715e4a0401..79b9ea5da7b1a019cac243dd82d82b49e1170f50 100644 (file)
--- a/reg-tests/checks/pgsql-check.vtc
+++ b/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}"

diff --git a/reg-tests/checks/redis-check.vtc b/reg-tests/checks/redis-check.vtc
index 3c74c93e85ad770487220e100ef18f431b32053a..7008b26454edcd33ab001050bdeed2bdb8f32416 100644 (file)
--- a/reg-tests/checks/redis-check.vtc
+++ b/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}"

diff --git a/reg-tests/checks/smtp-check.vtc b/reg-tests/checks/smtp-check.vtc
index 6a5f7b79dbe3cfef6ae0b160cca7c48c586b610b..4f2ecd073c725127a880e75d3363405b18514475 100644 (file)
--- a/reg-tests/checks/smtp-check.vtc
+++ b/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}"

diff --git a/reg-tests/checks/spop-check.vtc b/reg-tests/checks/spop-check.vtc
index 8a7fbd3add104427e2537cf58a6295d73e053784..cd0d3fe8d884b4138016d68ec11b9cb2bab85f38 100644 (file)
--- a/reg-tests/checks/spop-check.vtc
+++ b/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}"

diff --git a/reg-tests/checks/ssl-hello-check.vtc b/reg-tests/checks/ssl-hello-check.vtc
index a44b6e15cb113341198287c32418d2b3cf1f5844..1bb16a2a8164648889d5e393df5ce17be28fcc41 100644 (file)
--- a/reg-tests/checks/ssl-hello-check.vtc
+++ b/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

diff --git a/reg-tests/checks/tcp-check-client-hello.vtc b/reg-tests/checks/tcp-check-client-hello.vtc
index 435fec70f1881e8fa2e7128dd7b9bcb9d6f4facf..9ca9abd98a23ae91ffc6074411b3f244033db680 100644 (file)
--- a/reg-tests/checks/tcp-check-client-hello.vtc
+++ b/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

diff --git a/reg-tests/checks/tcp-check-ssl.vtc b/reg-tests/checks/tcp-check-ssl.vtc
index 4020f73f5a548ecd0172c23104e075faf7f7c810..540637ed2fd531262e940899e976d9c13a188cb9 100644 (file)
--- a/reg-tests/checks/tcp-check-ssl.vtc
+++ b/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

diff --git a/reg-tests/checks/tcp-check_min-recv.vtc b/reg-tests/checks/tcp-check_min-recv.vtc
index 83f4c6b913616416158c2bf8f8c618257cab0e8b..5fade86099e314100ad66c73c7afb421e6ea80fa 100644 (file)
--- a/reg-tests/checks/tcp-check_min-recv.vtc
+++ b/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}"

diff --git a/reg-tests/checks/tcp-check_multiple_ports.vtc b/reg-tests/checks/tcp-check_multiple_ports.vtc
index 356ddf61c140d2e4c663725fc13b1e465a21bcb8..753f154d2b5d0428facadc83d90306cabadcfc1e 100644 (file)
--- a/reg-tests/checks/tcp-check_multiple_ports.vtc
+++ b/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}"

diff --git a/reg-tests/checks/tcp-checks-socks4.vtc b/reg-tests/checks/tcp-checks-socks4.vtc
index 8a730f54240c511c0d1715abb60e4e1c76ab1947..0f297e4a677f01e594b3cd7535e76edf837543a8 100644 (file)
--- a/reg-tests/checks/tcp-checks-socks4.vtc
+++ b/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}"

diff --git a/reg-tests/checks/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc
index 9c3039f53ed45af1de57439c11f50570c770b132..6155b04ecced58e00f177997b86ea8c4603f21ca 100644 (file)
--- a/reg-tests/checks/tls_health_checks.vtc
+++ b/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

diff --git a/reg-tests/compression/basic.vtc b/reg-tests/compression/basic.vtc
index 78ca61b8d592d6849c2aa6a9846c9e35f6a49ed0..f1e088753b4b00cb26c7203636eba95cca3307c7 100644 (file)
--- a/reg-tests/compression/basic.vtc
+++ b/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}"

diff --git a/reg-tests/compression/etags_conversion.vtc b/reg-tests/compression/etags_conversion.vtc
index 96e34bcf9c0c155fd96e828680c851152739be63..57a9748b33b8166eba1c17b1d1000d111e4eb085 100644 (file)
--- a/reg-tests/compression/etags_conversion.vtc
+++ b/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.

diff --git a/reg-tests/compression/lua_validation.vtc b/reg-tests/compression/lua_validation.vtc
index 2bbf3a1a50e2cdcd93ac57d2e92be076f13a7adf..11bae837759fba6ae44c06c8cdb6fb0954c9b88f 100644 (file)
--- a/reg-tests/compression/lua_validation.vtc
+++ b/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
 

diff --git a/reg-tests/compression/min_size.vtc b/reg-tests/compression/min_size.vtc
index 52d0716690f5a4a212da4a54fc44f00f6267b855..cdf8f6e513d2518a92af61c82a1de803b36a0324 100644 (file)
--- a/reg-tests/compression/min_size.vtc
+++ b/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.

diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc
index 489de30f64f62f974c9eb2d43b3ce388854fa49f..b1e56432f2d702d8023e30ffa3831411ddd4cb15 100644 (file)
--- a/reg-tests/compression/vary.vtc
+++ b/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.

diff --git a/reg-tests/connection/cli_src_dst.vtc b/reg-tests/connection/cli_src_dst.vtc
index 6809d3948a688a29bdb3dd955de08b9ff3dae975..5e878c647b4f69bfd283c86162c1edcfdbbb8cf7 100644 (file)
--- a/reg-tests/connection/cli_src_dst.vtc
+++ b/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}"

diff --git a/reg-tests/connection/dispatch.vtc b/reg-tests/connection/dispatch.vtc
index 16151a188a9184668c84ae36bd46d7580651d7a1..9bb9f88f4a3e48b522a70bd21a612fa32ee96525 100644 (file)
--- a/reg-tests/connection/dispatch.vtc
+++ b/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
 

diff --git a/reg-tests/connection/h2_glitches.vtc b/reg-tests/connection/h2_glitches.vtc
index 2bf542f04a1ef43ac00292e0375f6d31577dd108..28281857c334040ee18e9bbd40ea8b501625d505 100644 (file)
--- a/reg-tests/connection/h2_glitches.vtc
+++ b/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

diff --git a/reg-tests/connection/http_reuse_aggressive.vtc b/reg-tests/connection/http_reuse_aggressive.vtc
index 571a974120e7190ebe138d0682a3b666a93ce199..b37a19c6f6332a4ef6a500fc261fa72d028fde75 100644 (file)
--- a/reg-tests/connection/http_reuse_aggressive.vtc
+++ b/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

diff --git a/reg-tests/connection/http_reuse_always.vtc b/reg-tests/connection/http_reuse_always.vtc
index 75e60d4d42fcf2df08fec7aa29b25a1ec8b9af3c..78f86368e654cff1ed9c162418bba429a0f127bb 100644 (file)
--- a/reg-tests/connection/http_reuse_always.vtc
+++ b/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

diff --git a/reg-tests/connection/http_reuse_be_transparent.vtc b/reg-tests/connection/http_reuse_be_transparent.vtc
index 312c0c0d2cef61996c96bd763740d374045b134c..d7df94a11284b0894e5f85a4f81b555d7b257cda 100644 (file)
--- a/reg-tests/connection/http_reuse_be_transparent.vtc
+++ b/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

diff --git a/reg-tests/connection/http_reuse_conn_hash.vtc b/reg-tests/connection/http_reuse_conn_hash.vtc
index a6c3605825857a838cd4629c39af83c16f297d28..37fc0513ff2b00906496080d61547e65a70a84d2 100644 (file)
--- a/reg-tests/connection/http_reuse_conn_hash.vtc
+++ b/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

diff --git a/reg-tests/connection/http_reuse_dispatch.vtc b/reg-tests/connection/http_reuse_dispatch.vtc
index 50f804beeee52750cbb035d22620c16bc4ae917c..c6f3c03dfaffbc5cfc0b7cb610270db1dc42d1da 100644 (file)
--- a/reg-tests/connection/http_reuse_dispatch.vtc
+++ b/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

diff --git a/reg-tests/connection/http_reuse_never.vtc b/reg-tests/connection/http_reuse_never.vtc
index d04bdfe59a6fbcab1bd409e1307408734c8c8e8e..ee4d59b2f3973b604baae1b602f02bf62c522813 100644 (file)
--- a/reg-tests/connection/http_reuse_never.vtc
+++ b/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

diff --git a/reg-tests/connection/http_reuse_safe.vtc b/reg-tests/connection/http_reuse_safe.vtc
index c554694ab674e13b2c6b67655034f199723f4a93..34ebadf3e8e48b28031b5acd0c20a42e3b123d10 100644 (file)
--- a/reg-tests/connection/http_reuse_safe.vtc
+++ b/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

diff --git a/reg-tests/connection/proxy_protocol_random_fail.vtc b/reg-tests/connection/proxy_protocol_random_fail.vtc
index 93667decf6c5ff067c9902f62c40b3a092189bcc..9870d131be8b5980a16da2c1db71e17f67a04f8a 100644 (file)
--- a/reg-tests/connection/proxy_protocol_random_fail.vtc
+++ b/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

diff --git a/reg-tests/connection/proxy_protocol_send_generic.vtc b/reg-tests/connection/proxy_protocol_send_generic.vtc
index af42dd342e32cfb7a5ca94c232a4bb8294661bfc..b4f0a13196e306b90b722e81919ac44f0bd7b5dd 100644 (file)
--- a/reg-tests/connection/proxy_protocol_send_generic.vtc
+++ b/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

diff --git a/reg-tests/connection/proxy_protocol_send_unique_id.vtc b/reg-tests/connection/proxy_protocol_send_unique_id.vtc
index b020ae850cdc57180a0dd54987d61e9aa601f9ad..fc4c8d77a8878f98263933caaa3501205bb59671 100644 (file)
--- a/reg-tests/connection/proxy_protocol_send_unique_id.vtc
+++ b/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

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 7ea30a5a2ba8cc1af4046645d27821bbcaf9a106..ab650948a6723207eeacbac6130712543588752a 100644 (file)
--- a/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc
+++ b/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

diff --git a/reg-tests/connection/proxy_protocol_tlv_validation.vtc b/reg-tests/connection/proxy_protocol_tlv_validation.vtc
index cd4fcd9468dfa47f21d5c5d941297e01777c8efa..63c2b764488b52d64bd46bd08318ef5f74d8238d 100644 (file)
--- a/reg-tests/connection/proxy_protocol_tlv_validation.vtc
+++ b/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}"

diff --git a/reg-tests/connection/reverse_connect_full.vtc b/reg-tests/connection/reverse_connect_full.vtc
index cc88382ced85367052e2bc88e5cb5f8346e67900..8fcadabe3bfd34a9b24ca85447a518c5d953f0dd 100644 (file)
--- a/reg-tests/connection/reverse_connect_full.vtc
+++ b/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

diff --git a/reg-tests/connection/reverse_server.vtc b/reg-tests/connection/reverse_server.vtc
index 5cd77ca7bb69591a702ae786b937f3c69a402424..9a0d3e6ac471f7a2fe1776f346826e8efb0b1b05 100644 (file)
--- a/reg-tests/connection/reverse_server.vtc
+++ b/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

diff --git a/reg-tests/connection/reverse_server_name.vtc b/reg-tests/connection/reverse_server_name.vtc
index 3a246017433eda30f9942b0902b711fb783d3305..a37307a225aa789de9becc03ff95423442a2d890 100644 (file)
--- a/reg-tests/connection/reverse_server_name.vtc
+++ b/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

diff --git a/reg-tests/connection/tcp_to_http_upgrade.vtc b/reg-tests/connection/tcp_to_http_upgrade.vtc
index 0956f2cbdb957349b260c8cfd564e95651a5cbcc..304bf5f3e4a56b857e980e105d80e2be8a59e8f1 100644 (file)
--- a/reg-tests/connection/tcp_to_http_upgrade.vtc
+++ b/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

diff --git a/reg-tests/contrib/prometheus.vtc b/reg-tests/contrib/prometheus.vtc
index 89d65d7b74c25ec1c120d1b2f89aedbf35274159..9efee4be2b025156c900e9c9d65c01ccb7cb3fb0 100644 (file)
--- a/reg-tests/contrib/prometheus.vtc
+++ b/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}"

diff --git a/reg-tests/converter/add_item.vtc b/reg-tests/converter/add_item.vtc
index 474ad7bf815b512bb4cdb9ea499c6ea0f0c14c1d..46ce5912df3967aef1bd8e2e4bb5f087d7eb61d9 100644 (file)
--- a/reg-tests/converter/add_item.vtc
+++ b/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}"

diff --git a/reg-tests/converter/be2dec.vtc b/reg-tests/converter/be2dec.vtc
index a0b71046bccbc9598b2afc5ae0dea69776ba3460..9b3db73b598b7dda340496f0c9ff770a5be1b58d 100644 (file)
--- a/reg-tests/converter/be2dec.vtc
+++ b/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}"

diff --git a/reg-tests/converter/be2hex.vtc b/reg-tests/converter/be2hex.vtc
index 4cf3dc1dfcf66396c953c292e09a27db422fa2ca..133d5b866cc3e2290fbe418f0a88e335ab0eabdb 100644 (file)
--- a/reg-tests/converter/be2hex.vtc
+++ b/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}"

diff --git a/reg-tests/converter/bytes.vtc b/reg-tests/converter/bytes.vtc
index 8abe401e55be49cef2a47ff59e37aed5ee91b498..c4a4889fdc6699e0e70771c35453c616ec29b76c 100644 (file)
--- a/reg-tests/converter/bytes.vtc
+++ b/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}"

diff --git a/reg-tests/converter/digest.vtc b/reg-tests/converter/digest.vtc
index fff0ae398eb7d3499b6ae98ff9ee11eb06ab07ed..5c3435e2f1ea92f0b9f8dae5eff07bce1d77bba3 100644 (file)
--- a/reg-tests/converter/digest.vtc
+++ b/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}"

diff --git a/reg-tests/converter/field.vtc b/reg-tests/converter/field.vtc
index 3b1d8198e36b203e891e03cf7942a9118d56cb85..b3c99adf20003fbad22b9a11f43b069c39e5ace9 100644 (file)
--- a/reg-tests/converter/field.vtc
+++ b/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}"

diff --git a/reg-tests/converter/fix.vtc b/reg-tests/converter/fix.vtc
index f15c0c9249626cc12b7900f06d5ba92f4031e9d4..5431a3a56db2c5da89a83133ea749b61e022ae74 100644 (file)
--- a/reg-tests/converter/fix.vtc
+++ b/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}"

diff --git a/reg-tests/converter/hmac.vtc b/reg-tests/converter/hmac.vtc
index 13729f650ccb53172da6eea46378f1b81a081c33..12f1227ec4afc3d85eba116ade049e860f61876f 100644 (file)
--- a/reg-tests/converter/hmac.vtc
+++ b/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}"

diff --git a/reg-tests/converter/iif.vtc b/reg-tests/converter/iif.vtc
index 2c0c517fbbaec31b669c74f5521a725553a4fa63..2cd7323e7e987c9aa7a9d8ea7c79d6d4939f32d3 100644 (file)
--- a/reg-tests/converter/iif.vtc
+++ b/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}"

diff --git a/reg-tests/converter/json.vtc b/reg-tests/converter/json.vtc
index 1f37c9f1f7309ab02d4331f1a0d4c36618f5430a..b0dcf7b8b361a1639beb31da7c4c5712794f7e5a 100644 (file)
--- a/reg-tests/converter/json.vtc
+++ b/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}"

diff --git a/reg-tests/converter/json_query.vtc b/reg-tests/converter/json_query.vtc
index 4ffaf11d56c0eae7f1054a8408a93f3c5434b9fb..087f7833bd799d636b4e0d9bbb719f2ee020a343 100644 (file)
--- a/reg-tests/converter/json_query.vtc
+++ b/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.

diff --git a/reg-tests/converter/mqtt.vtc b/reg-tests/converter/mqtt.vtc
index 3ef0d1fa75b2ae5948743db5abd0b6bc54e027ca..2ab8ececc549e987bdd3a7b6b6d7670777e5edf8 100644 (file)
--- a/reg-tests/converter/mqtt.vtc
+++ b/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}"

diff --git a/reg-tests/converter/param.vtc b/reg-tests/converter/param.vtc
index 1633603823545df35bfacb18fec003032cf3c18c..c33dc64eab5bea5fc615d5c33d0ce50b6f320888 100644 (file)
--- a/reg-tests/converter/param.vtc
+++ b/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}"

diff --git a/reg-tests/converter/secure_memcmp.vtc b/reg-tests/converter/secure_memcmp.vtc
index dfda40ec3740a7b51edd50b30dceef779b271a9f..b3ef4ecd3451876699f0ffbc1c1fd0d266cd9563 100644 (file)
--- a/reg-tests/converter/secure_memcmp.vtc
+++ b/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.

diff --git a/reg-tests/converter/sha2.vtc b/reg-tests/converter/sha2.vtc
index b10e45e54b99989cf6c70028ed9d9b0b2cd19d8f..3d7e7b1d36c68fbac7fcd64e8e37c224c43145b1 100644 (file)
--- a/reg-tests/converter/sha2.vtc
+++ b/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}"

diff --git a/reg-tests/converter/url_dec.vtc b/reg-tests/converter/url_dec.vtc
index d5e317bb2c70109c83d7cc0aa447805b6186e688..89187783193c2b62c9111b45322d40a88df58558 100644 (file)
--- a/reg-tests/converter/url_dec.vtc
+++ b/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}"

diff --git a/reg-tests/converter/url_enc.vtc b/reg-tests/converter/url_enc.vtc
index f3e6271d55359bedc69b15edbea13da0af20d45f..f35b9f24c7b40e4631c2edfa404f7125e42cdf8d 100644 (file)
--- a/reg-tests/converter/url_enc.vtc
+++ b/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}"

diff --git a/reg-tests/converter/word.vtc b/reg-tests/converter/word.vtc
index acd46781f599186e608096a00cf5258bbb9f638e..9ee5403eda4667050d435fe42bd567faf3b38e07 100644 (file)
--- a/reg-tests/converter/word.vtc
+++ b/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}"

diff --git a/reg-tests/filters/random-forwarding.vtc b/reg-tests/filters/random-forwarding.vtc
index 2ca483ea7371ff7f7d84603b45eb477f53572fea..0db734007bb4bcfb8a0297d9f92b065043d66f6a 100644 (file)
--- a/reg-tests/filters/random-forwarding.vtc
+++ b/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}"

diff --git a/reg-tests/http-capture/multiple_headers.vtc b/reg-tests/http-capture/multiple_headers.vtc
index 1ae210b65c0ecea8d622fa56fbff031cd158832a..6c95c627adb9b4250e436cc6a07c6c2306e1836b 100644 (file)
--- a/reg-tests/http-capture/multiple_headers.vtc
+++ b/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}"

diff --git a/reg-tests/http-cookies/cookie_insert_indirect.vtc b/reg-tests/http-cookies/cookie_insert_indirect.vtc
index 6b86360ad72af9ed5d32ea6e27d47fc95de2fb8b..297f561f7c8c645a2c66e74d58f69af37dce25dd 100644 (file)
--- a/reg-tests/http-cookies/cookie_insert_indirect.vtc
+++ b/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

diff --git a/reg-tests/http-cookies/h2_cookie_concat.vtc b/reg-tests/http-cookies/h2_cookie_concat.vtc
index f5ae9b9732c3a111298a54b4e53e66aca14b96c1..5f73d838cf5ceffbf96033ebe9aab20108e12020 100644 (file)
--- a/reg-tests/http-cookies/h2_cookie_concat.vtc
+++ b/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

diff --git a/reg-tests/http-errorfiles/errorfiles.vtc b/reg-tests/http-errorfiles/errorfiles.vtc
index 1ace744fad8f3b9a121138c3892c038a64fa1497..82b5847b9ce9ab96ec5a57644d0316031dd68ce2 100644 (file)
--- a/reg-tests/http-errorfiles/errorfiles.vtc
+++ b/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}"

diff --git a/reg-tests/http-errorfiles/http-error.vtc b/reg-tests/http-errorfiles/http-error.vtc
index 6d82f28280a76342db4849ae1148f449cbbcccad..43d1bcaf123424f96d9a6e8af816e586d37f5b51 100644 (file)
--- a/reg-tests/http-errorfiles/http-error.vtc
+++ b/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

diff --git a/reg-tests/http-errorfiles/http_deny_errors.vtc b/reg-tests/http-errorfiles/http_deny_errors.vtc
index befec708e2df782177adfa70eb4b8d70ad36a184..6f8993c2197cc1ef8d32e2f58434003cf9303c33 100644 (file)
--- a/reg-tests/http-errorfiles/http_deny_errors.vtc
+++ b/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

diff --git a/reg-tests/http-errorfiles/http_errors.vtc b/reg-tests/http-errorfiles/http_errors.vtc
index 4bc2276741bc557f0d9624896c57c0625174f537..a660279ab6363751dd10a40d795644c790c703a5 100644 (file)
--- a/reg-tests/http-errorfiles/http_errors.vtc
+++ b/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

diff --git a/reg-tests/http-errorfiles/http_return.vtc b/reg-tests/http-errorfiles/http_return.vtc
index b7750501c8e0198b9fe17249fa301e6e3b7ea3c2..c0cb24ddb82df55b3898f0b620dccc24d2ab87c1 100644 (file)
--- a/reg-tests/http-errorfiles/http_return.vtc
+++ b/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
 

diff --git a/reg-tests/http-messaging/h1_host_normalization.vtc b/reg-tests/http-messaging/h1_host_normalization.vtc
index 909d5250942c7e3ae70b6a579bf6f02457584f3b..0d61127055eae6054be9fb3a96f2e27bac0363b3 100644 (file)
--- a/reg-tests/http-messaging/h1_host_normalization.vtc
+++ b/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}"

diff --git a/reg-tests/http-messaging/h1_request_target_validation.vtc b/reg-tests/http-messaging/h1_request_target_validation.vtc
index 3f008fef66b26ffbd0643c659777458383ebcaad..81e73c04b2b023ba56abb77f9c83fbe9e83f18fd 100644 (file)
--- a/reg-tests/http-messaging/h1_request_target_validation.vtc
+++ b/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.

diff --git a/reg-tests/http-messaging/h1_to_h1.vtc b/reg-tests/http-messaging/h1_to_h1.vtc
index 67aba14409493e439b105c571603f56e3cc57668..090c798c03ebb3159c40387477c1aef727197709 100644 (file)
--- a/reg-tests/http-messaging/h1_to_h1.vtc
+++ b/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.

diff --git a/reg-tests/http-messaging/h2_desync_attacks.vtc b/reg-tests/http-messaging/h2_desync_attacks.vtc
index c638f7d5b0fafc5233b3f20518446450309264e3..f77538b0733850e5a26fb2e6192b1a25f2710f52 100644 (file)
--- a/reg-tests/http-messaging/h2_desync_attacks.vtc
+++ b/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

diff --git a/reg-tests/http-messaging/h2_to_h1.vtc b/reg-tests/http-messaging/h2_to_h1.vtc
index 637b664866c64c4efd0a262f51cc9db3e8fa1e61..e044b31626ec333da3ae90a93c408e88e2b2c39c 100644 (file)
--- a/reg-tests/http-messaging/h2_to_h1.vtc
+++ b/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.

diff --git a/reg-tests/http-messaging/http_abortonclose.vtc b/reg-tests/http-messaging/http_abortonclose.vtc
index ea57f3d6be19d5d0d2b49f639f2f5368305b2907..f9ad90621ab2e688edff51ef04abc4cacc535f5c 100644 (file)
--- a/reg-tests/http-messaging/http_abortonclose.vtc
+++ b/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.

diff --git a/reg-tests/http-messaging/http_bodyless_response.vtc b/reg-tests/http-messaging/http_bodyless_response.vtc
index c470a97f73c58f18ff1c6e819ca94257b4ab285e..e54782e37438a306998df7906a286ff351ffa774 100644 (file)
--- a/reg-tests/http-messaging/http_bodyless_response.vtc
+++ b/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.

diff --git a/reg-tests/http-messaging/http_bodyless_spliced_response.vtc b/reg-tests/http-messaging/http_bodyless_spliced_response.vtc
index b91809fd15bca99dcd5055b331e0dda2c864dd6e..26d6033213ee29d043760db46988971aec4b9233 100644 (file)
--- a/reg-tests/http-messaging/http_bodyless_spliced_response.vtc
+++ b/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.

diff --git a/reg-tests/http-messaging/http_request_buffer.vtc b/reg-tests/http-messaging/http_request_buffer.vtc
index 302db4ab4e01091104bd5f2c6db5d1463ed7fc97..a0f72dedefad07701923c3647a6c4dc2fffd4bb2 100644 (file)
--- a/reg-tests/http-messaging/http_request_buffer.vtc
+++ b/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

diff --git a/reg-tests/http-messaging/http_splicing.vtc b/reg-tests/http-messaging/http_splicing.vtc
index e86680bd55ee4004d514a815c05d9731033cdc66..a86e2f77a849155de8c648b83118d586d4cdde1e 100644 (file)
--- a/reg-tests/http-messaging/http_splicing.vtc
+++ b/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

diff --git a/reg-tests/http-messaging/http_splicing_chunk.vtc b/reg-tests/http-messaging/http_splicing_chunk.vtc
index e2e9f32ddd04880eaee826166ee4f99d82f7203f..99e0142d644bfadcdaebe862d708c9355f39f94b 100644 (file)
--- a/reg-tests/http-messaging/http_splicing_chunk.vtc
+++ b/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

diff --git a/reg-tests/http-messaging/http_transfer_encoding.vtc b/reg-tests/http-messaging/http_transfer_encoding.vtc
index 322dfe29acabd9d6ffc9f25cb04c8674a858e687..a04a5f76519e7d1ff3465668f2a2833b81607a3c 100644 (file)
--- a/reg-tests/http-messaging/http_transfer_encoding.vtc
+++ b/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}"

diff --git a/reg-tests/http-messaging/http_wait_for_body.vtc b/reg-tests/http-messaging/http_wait_for_body.vtc
index f0873166ffc0f0700e959dd9c13f8ec2703134db..11d6bcae720943c9cd61be8bbda7d234aa107b9e 100644 (file)
--- a/reg-tests/http-messaging/http_wait_for_body.vtc
+++ b/reg-tests/http-messaging/http_wait_for_body.vtc
@@ -69,6 +69,11 @@ server s2 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 ea66ebd5058b1fd82095e524b451d25772252a0a..46418a74913b6431ba49ae203e855d4351fef6a4 100644 (file)
--- a/reg-tests/http-messaging/protocol_upgrade.vtc
+++ b/reg-tests/http-messaging/protocol_upgrade.vtc
@@ -138,6 +138,11 @@ server srv_h1_h2c {
 } -start
 
 haproxy hap -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 3edbafbd10f7c70e711298501c69259ec4cf70ef..53a3bec0be08808b2c55050fb38a2166ef50ada9 100644 (file)
--- a/reg-tests/http-messaging/scheme_based_normalize.vtc
+++ b/reg-tests/http-messaging/scheme_based_normalize.vtc
@@ -18,6 +18,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}"

diff --git a/reg-tests/http-messaging/srv_ws.vtc b/reg-tests/http-messaging/srv_ws.vtc
index 99698133348559d4979bf5bbeb523881ad482d06..5f1de0aea2f772b9afc2eeda98702757616b32f7 100644 (file)
--- a/reg-tests/http-messaging/srv_ws.vtc
+++ b/reg-tests/http-messaging/srv_ws.vtc
@@ -9,6 +9,11 @@ feature ignore_unknown_macro
 
 # haproxy server
 haproxy hapsrv -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
                mode http
                timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -38,6 +43,11 @@ haproxy hapsrv -conf {
 
 # haproxy LB
 haproxy hap -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 a8048e1006175bd76cfc1af685b8ca5900d0f3cb..ca6d52abdd7b985fa7bcf488a9b7233bb5aae1c7 100644 (file)
--- a/reg-tests/http-messaging/truncated.vtc
+++ b/reg-tests/http-messaging/truncated.vtc
@@ -61,6 +61,11 @@ server s1 {
 } -repeat 2 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 a792a0b6972163837b834412d997b09e80d3659a..e21ddd5bbcae8e94ca580ac0bf2746e3e43d9d76 100644 (file)
--- a/reg-tests/http-messaging/websocket.vtc
+++ b/reg-tests/http-messaging/websocket.vtc
@@ -46,6 +46,11 @@ server s2 {
 # haproxy instance used as a server
 # generate a http/1.1 websocket response with the valid key
 haproxy hap_srv -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
        mode http
        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -68,6 +73,11 @@ haproxy hap_srv -conf {
 # haproxy instance used as a server
 # generate a http/1.1 websocket response with an invalid key
 haproxy hap_srv_bad_key -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
        mode http
        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -88,6 +98,11 @@ haproxy hap_srv_bad_key -conf {
 } -start
 
 haproxy hap -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 8783f11a9f60bddc6c0fcef4ecbfdf73b7f2d3b3..90ba1d1076226ab3a62e61052498a734afdbbb07 100644 (file)
--- a/reg-tests/http-rules/acl_cli_spaces.vtc
+++ b/reg-tests/http-rules/acl_cli_spaces.vtc
@@ -9,6 +9,11 @@ server s1 {
 } -repeat 2 -start
 
 haproxy h1 -Ws -S -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   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 b2b8ae83aba461a0fcfb17b3c1aa9ee15a20adc5..16596d03787a64ea8110c8efb9c7fbe7881b906e 100644 (file)
--- a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
+++ b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
@@ -73,6 +73,11 @@ server s2 {
 
 # ipmask,hdr_ip tests with accept-proxy bind
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   defaults
     mode http
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -132,6 +137,11 @@ haproxy h1 -conf {
 
 # concat,strcmp,word,field haproxy
 haproxy h2 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   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 cc726ab08f1b35ac5c02e2a8b7bf5c87472ed282..647f29d96e46a0f03cf2fcff742952fc8b0f61fe 100644 (file)
--- a/reg-tests/http-rules/default_rules.vtc
+++ b/reg-tests/http-rules/default_rules.vtc
@@ -18,6 +18,11 @@ server s2 {
 }  -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   defaults common
       mode http
       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -58,6 +63,11 @@ haproxy h1 -conf {
 
 
 haproxy h2 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   defaults common
       mode http
       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -93,6 +103,11 @@ haproxy h2 -conf {
 } -start
 
 haproxy h3 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   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 0f74a606e1f537c42f980ee237af06ac2f1991b3..cffcde81f58a5c8a5bf1d82da6411c0aaa67aa43 100644 (file)
--- a/reg-tests/http-rules/del_header.vtc
+++ b/reg-tests/http-rules/del_header.vtc
@@ -34,6 +34,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 211c1c109c0922f5a72b2ced2b3b0650247f6694..cb1f5a830b9c1b5b18cac3eb8660352c5362c899 100644 (file)
--- a/reg-tests/http-rules/except-forwardfor-originalto.vtc
+++ b/reg-tests/http-rules/except-forwardfor-originalto.vtc
@@ -7,6 +7,10 @@ feature ignore_unknown_macro
 
 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.

diff --git a/reg-tests/http-rules/forwarded-header-7239.vtc b/reg-tests/http-rules/forwarded-header-7239.vtc
index dd2c6e3fd0fa2e404b81426521d925b0e478cd12..a3e15e9f6ea2aa3ce9c930b5d8b4c13b2611c754 100644 (file)
--- a/reg-tests/http-rules/forwarded-header-7239.vtc
+++ b/reg-tests/http-rules/forwarded-header-7239.vtc
@@ -8,6 +8,10 @@ feature ignore_unknown_macro
 #test: converters, parsing and header injection logic
 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.
@@ -55,6 +59,10 @@ haproxy h1 -conf {
 #test: "default" and "no option forwarded"
 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.

diff --git a/reg-tests/http-rules/h1or2_to_h1c.vtc b/reg-tests/http-rules/h1or2_to_h1c.vtc
index 89ae0f6a6f5aba9619323988d805a18ba5e0dc84..f5e76da18908ce6961f5711ad5abf2efeba6caba 100644 (file)
--- a/reg-tests/http-rules/h1or2_to_h1c.vtc
+++ b/reg-tests/http-rules/h1or2_to_h1c.vtc
@@ -35,6 +35,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}"

diff --git a/reg-tests/http-rules/http-err-fail.vtc b/reg-tests/http-rules/http-err-fail.vtc
index 6d8f9ea3e8765ee741e5ff2602a361b0d27a5d3b..7a504ac56bc66f4d3f3901fa6857a7bfaf0517a5 100644 (file)
--- a/reg-tests/http-rules/http-err-fail.vtc
+++ b/reg-tests/http-rules/http-err-fail.vtc
@@ -26,6 +26,10 @@ server s5 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 871cc27730a862431429613086ebb3a865addb58..1bf4f0c4364d3de4f007c3df548392a5b614a988 100644 (file)
--- a/reg-tests/http-rules/http_after_response.vtc
+++ b/reg-tests/http-rules/http_after_response.vtc
@@ -19,6 +19,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}"

diff --git a/reg-tests/http-rules/http_return.vtc b/reg-tests/http-rules/http_return.vtc
index ea4e95672e0a2295778089887e9c80bbb12d50ee..dbbbe4a8e6b40569ad67ffbe969308679ce156b8 100644 (file)
--- a/reg-tests/http-rules/http_return.vtc
+++ b/reg-tests/http-rules/http_return.vtc
@@ -6,6 +6,10 @@ feature ignore_unknown_macro
 
 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.

diff --git a/reg-tests/http-rules/ifnone-forwardfor.vtc b/reg-tests/http-rules/ifnone-forwardfor.vtc
index a743b10b4efe5007dbc3b7f5d2f5b6f4f668b5d2..699a9f63095eaa5a2c18d800843781fed5e613f8 100644 (file)
--- a/reg-tests/http-rules/ifnone-forwardfor.vtc
+++ b/reg-tests/http-rules/ifnone-forwardfor.vtc
@@ -7,6 +7,10 @@ feature ignore_unknown_macro
 
 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.

diff --git a/reg-tests/http-rules/map_ordering.vtc b/reg-tests/http-rules/map_ordering.vtc
index 923d19fa5837401fb3c9c01fa32dba8f98fc262d..f3e4fdafdeb5fbcb1d0ca81fee2c1afe6f9bf9db 100644 (file)
--- a/reg-tests/http-rules/map_ordering.vtc
+++ b/reg-tests/http-rules/map_ordering.vtc
@@ -3,6 +3,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}"

diff --git a/reg-tests/http-rules/map_redirect.vtc b/reg-tests/http-rules/map_redirect.vtc
index e8ed0336399c022a5a5e8ccb6c503225b424f508..bf58da8ee67fdbed9448b2f5973dfceb5cf0281e 100644 (file)
--- a/reg-tests/http-rules/map_redirect.vtc
+++ b/reg-tests/http-rules/map_redirect.vtc
@@ -32,6 +32,11 @@ server s4 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   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 c3b21fbde7e846b0878461d7da8b31fc26d46168..5f9ef04cbf95c0336532b7255741fd4c67134772 100644 (file)
--- a/reg-tests/http-rules/map_regm_with_backref.vtc
+++ b/reg-tests/http-rules/map_regm_with_backref.vtc
@@ -34,6 +34,10 @@ server s1 {
 
 haproxy h1 -conf {
   global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     log ${S1_addr}:${S1_port} local0 debug err
 
   defaults

diff --git a/reg-tests/http-rules/normalize_uri.vtc b/reg-tests/http-rules/normalize_uri.vtc
index 92325e6a149f9a9c399590fa2b8e95065a0c57b8..6df9a9890c61b7d56d0bdc2c519b227a6ca5cefb 100644 (file)
--- a/reg-tests/http-rules/normalize_uri.vtc
+++ b/reg-tests/http-rules/normalize_uri.vtc
@@ -11,6 +11,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.

diff --git a/reg-tests/http-rules/path_and_pathq.vtc b/reg-tests/http-rules/path_and_pathq.vtc
index 971cbe2d5d7b52f461fb5a2f13c1e5faf26d65eb..2fd1f7ba6e5c8399403f6423d15a6afbda085056 100644 (file)
--- a/reg-tests/http-rules/path_and_pathq.vtc
+++ b/reg-tests/http-rules/path_and_pathq.vtc
@@ -25,6 +25,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 4b26e33c67ee17c5d33bb5f5fcbb8330638aa4ec..35e5dc02801a67bb36291495bbd61e008927f9bb 100644 (file)
--- a/reg-tests/http-rules/restrict_req_hdr_names.vtc
+++ b/reg-tests/http-rules/restrict_req_hdr_names.vtc
@@ -62,6 +62,11 @@ server s9 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 89a4548f7ee6ad183d1b720cd81168ee3ae8520e..c0e592dde2d76321348d3ddde58d682f9e587dcd 100644 (file)
--- a/reg-tests/http-rules/strict_rw_mode.vtc
+++ b/reg-tests/http-rules/strict_rw_mode.vtc
@@ -62,6 +62,10 @@ server s2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         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 7887f2abc72cd50932bf80f9e92684d4c1557f40..4b4a43149af36999c4af9f4f0187f01c13bc0a1d 100644 (file)
--- a/reg-tests/http-set-timeout/set_timeout.vtc
+++ b/reg-tests/http-set-timeout/set_timeout.vtc
@@ -53,6 +53,11 @@ syslog Slog9 -level info {
 } -start
 
 haproxy hap -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout connect 5s
         timeout client 5s

diff --git a/reg-tests/jwt/jws_verify.vtc b/reg-tests/jwt/jws_verify.vtc
index f6951ec77a185e68291765b4092e177f81540ce9..c4309f85a06e2bd4372c4c10c840cc3bd6ba4e47 100644 (file)
--- a/reg-tests/jwt/jws_verify.vtc
+++ b/reg-tests/jwt/jws_verify.vtc
@@ -23,6 +23,10 @@ server s1 -repeat 26 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/log/load_balancing.vtc b/reg-tests/log/load_balancing.vtc
index 5c56e653dc7e862901f8c37959258f035430b101..bef3388553e83e1e5eb261fb077fc85f6e8600dd 100644 (file)
--- a/reg-tests/log/load_balancing.vtc
+++ b/reg-tests/log/load_balancing.vtc
@@ -35,6 +35,10 @@ syslog Slg_2 -level info {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                nbthread 1
 
        defaults

diff --git a/reg-tests/log/log_backend.vtc b/reg-tests/log/log_backend.vtc
index a9223ee01a7ebdf739ab27aed24ad9af9766d690..c3a83d947b80e42792a81430ee2cbece1b68293e 100644 (file)
--- a/reg-tests/log/log_backend.vtc
+++ b/reg-tests/log/log_backend.vtc
@@ -38,6 +38,11 @@ syslog Slg24 -level info {
 } -repeat 1 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
                mode http
                option httplog

diff --git a/reg-tests/log/log_forward.vtc b/reg-tests/log/log_forward.vtc
index 3977f4ca5def9916ea078fbf52c5ff331e16286f..f9da2937a4db300fa78c3076387865056cb871eb 100644 (file)
--- a/reg-tests/log/log_forward.vtc
+++ b/reg-tests/log/log_forward.vtc
@@ -13,6 +13,11 @@ syslog Slg1 -level info {
 } -repeat 50 -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
                mode http
                option httplog

diff --git a/reg-tests/log/log_profiles.vtc b/reg-tests/log/log_profiles.vtc
index 0aeb338d4dc60b5d0d162c83ca32dc60a776d521..34da1c96ae17975dbd5cca84fc112c8dcc872f04 100644 (file)
--- a/reg-tests/log/log_profiles.vtc
+++ b/reg-tests/log/log_profiles.vtc
@@ -111,6 +111,11 @@ syslog Slg6 -level info {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 753709d0e157337c1edad6fe583c14d4c8a9168d..f16360c17029ebf3a016a70944ad598ee8aa7ccd 100644 (file)
--- a/reg-tests/log/log_uri.vtc
+++ b/reg-tests/log/log_uri.vtc
@@ -19,6 +19,10 @@ syslog Slg_1 -level info {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         nbthread 1
 
     defaults

diff --git a/reg-tests/log/wrong_ip_port_logging.vtc b/reg-tests/log/wrong_ip_port_logging.vtc
index 44312af9fe8ca47c5cc4ae53a3bc2e427caaf46d..8bc072aaca9f9cb27a2b93c1570f6dd72460d7d0 100644 (file)
--- a/reg-tests/log/wrong_ip_port_logging.vtc
+++ b/reg-tests/log/wrong_ip_port_logging.vtc
@@ -35,6 +35,10 @@ syslog Slg_1 -level notice {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         log ${Slg_1_addr}:${Slg_1_port} local0
 
 defaults

diff --git a/reg-tests/lua/bad_http_clt_req_duration.vtc b/reg-tests/lua/bad_http_clt_req_duration.vtc
index ef15982a7651f6102e613906a74901a72791a573..67c100b70faff89e58a06e8828abce4358564711 100644 (file)
--- a/reg-tests/lua/bad_http_clt_req_duration.vtc
+++ b/reg-tests/lua/bad_http_clt_req_duration.vtc
@@ -35,6 +35,10 @@ syslog Slog {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         tune.lua.bool-sample-conversion normal
         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 9e2230a2cf2c7421c5db1b07870e704369276e14..c5a0d18c7b68788362f3e655d0cdf9dc0c6fc34f 100644 (file)
--- a/reg-tests/lua/close_wait_lf.vtc
+++ b/reg-tests/lua/close_wait_lf.vtc
@@ -25,14 +25,18 @@ syslog Slog -level info -repeat 100 {
 } -start
 
 haproxy h1 -conf {
-    defaults
-        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
-        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
-
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         tune.lua.bool-sample-conversion normal
         lua-load ${testdir}/close_wait_lf.lua
 
+    defaults
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+
     frontend frt
         log ${Slog_addr}:${Slog_port} local0 debug err
         log-format Ta=%Ta\ Tc=%Tc\ Td=%Td\ Th=%Th\ Ti=%Ti\ Tq=%Tq\ TR=%TR\ Tr=%Tr\ Tt=%Tt\ Tw=%Tw

diff --git a/reg-tests/lua/h_txn_get_priv.vtc b/reg-tests/lua/h_txn_get_priv.vtc
index 8a2931b5bd9298c15a66582712a51c5e8802a4a2..43801bb5d93ab3748f89da099a21501468743cc6 100644 (file)
--- a/reg-tests/lua/h_txn_get_priv.vtc
+++ b/reg-tests/lua/h_txn_get_priv.vtc
@@ -5,6 +5,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}/h_txn_get_priv.lua
 

diff --git a/reg-tests/lua/httpclient_action.vtc b/reg-tests/lua/httpclient_action.vtc
index 95baca0d8cd3c3474dc920ac7102c4a8c5a0f11e..8939bdb8035fcb024f5e4a6e9d7962fc958728bd 100644 (file)
--- a/reg-tests/lua/httpclient_action.vtc
+++ b/reg-tests/lua/httpclient_action.vtc
@@ -12,6 +12,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}/httpclient_action.lua
     defaults

diff --git a/reg-tests/lua/lua_httpclient.vtc b/reg-tests/lua/lua_httpclient.vtc
index 996d991716e4e00ef8b847ccbdb6bad720842bf7..f83942605d16d4f5daa8cd332ae4dca092f0b276 100644 (file)
--- a/reg-tests/lua/lua_httpclient.vtc
+++ b/reg-tests/lua/lua_httpclient.vtc
@@ -38,6 +38,10 @@ server s3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         tune.lua.bool-sample-conversion normal
         lua-load ${testdir}/lua_httpclient.lua
 

diff --git a/reg-tests/lua/lua_socket.vtc b/reg-tests/lua/lua_socket.vtc
index b3b716ea9785bbbd1feaf2e419ca29235c583510..b77ab0b86e245fd2975f5d02a0094e6df5e8b82a 100644 (file)
--- a/reg-tests/lua/lua_socket.vtc
+++ b/reg-tests/lua/lua_socket.vtc
@@ -10,6 +10,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         tune.lua.bool-sample-conversion normal
         lua-load ${testdir}/lua_socket.lua
 

diff --git a/reg-tests/lua/set_var.vtc b/reg-tests/lua/set_var.vtc
index 0d018fc4c035784aa27d4149ad467ffe6be165c8..bce4333321c3242495ca5c44344f5d51948d7add 100644 (file)
--- a/reg-tests/lua/set_var.vtc
+++ b/reg-tests/lua/set_var.vtc
@@ -5,12 +5,20 @@ feature ignore_unknown_macro
 
 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.
         tune.idle-pool.shared off
 
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         tune.lua.bool-sample-conversion normal
         lua-load ${testdir}/set_var.lua
 

diff --git a/reg-tests/lua/txn_get_priv-thread.vtc b/reg-tests/lua/txn_get_priv-thread.vtc
index 042404fafea06fd097c58457dd9d1141d24069f0..c58f93a55b2d921992dcd865995a0ddb64ba0dd7 100644 (file)
--- a/reg-tests/lua/txn_get_priv-thread.vtc
+++ b/reg-tests/lua/txn_get_priv-thread.vtc
@@ -6,6 +6,10 @@ feature ignore_unknown_macro
 
 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.

diff --git a/reg-tests/lua/txn_get_priv.vtc b/reg-tests/lua/txn_get_priv.vtc
index 2951f110c0fb7b0f9ac9fb9e1bdc307b3d3362dc..24ac96252ffb8ba97469fe7fa0139162b1e0699b 100644 (file)
--- a/reg-tests/lua/txn_get_priv.vtc
+++ b/reg-tests/lua/txn_get_priv.vtc
@@ -6,6 +6,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}/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 f06b18a035ab2b8bc556ab826656ce547a13f441..c394fc5669a87145347ad078499f47607df7e016 100644 (file)
--- a/reg-tests/lua/wrong_types_usage.vtc
+++ b/reg-tests/lua/wrong_types_usage.vtc
@@ -43,6 +43,10 @@ server s1 -repeat 2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         tune.lua.bool-sample-conversion normal
         lua-load ${testdir}/wrong_types_usage.lua
 

diff --git a/reg-tests/mailers/healthcheckmail.vtc b/reg-tests/mailers/healthcheckmail.vtc
index dbf4e9cc605c57d00341f514b173eee4308abefa..c23aa727359b7b8fbc44318715555f73d476b77d 100644 (file)
--- a/reg-tests/mailers/healthcheckmail.vtc
+++ b/reg-tests/mailers/healthcheckmail.vtc
@@ -12,6 +12,10 @@ syslog S1 -level notice {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         tune.lua.bool-sample-conversion normal
         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 0ecaa6202b88703be46d72fa4ab27b5c72832c0b..00879514ef3d28da0e4028451285e263b12281f1 100644 (file)
--- a/reg-tests/mcli/mcli_debug_dev.vtc
+++ b/reg-tests/mcli/mcli_debug_dev.vtc
@@ -22,6 +22,10 @@ syslog S1 -level info {
 
 haproxy h1 -Ws -S -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        log ${S1_addr}:${S1_port} local0 info
 
     defaults

diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc
index 5c1949fd3b587c83a94aa6892812e3e525b49a39..5ee16110a3a6606df3fce1f3e435d4d19570ce27 100644 (file)
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -8,6 +8,11 @@ server s1 {
 } -start
 
 haproxy h1 -Ws -S -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 5c0cb4117c1f326cc3b58091e6e9b8f250fb9585..f25e1f24a7a4fa47644cdea41e6ad7b0c4201e72 100644 (file)
--- a/reg-tests/peers/basic_sync.vtc
+++ b/reg-tests/peers/basic_sync.vtc
@@ -4,6 +4,11 @@ feature ignore_unknown_macro
 #REGTEST_TYPE=slow
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -26,6 +31,11 @@ haproxy h1 -arg "-L A" -conf {
 }
 
 haproxy h2 -arg "-L B" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
        mode http
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -48,6 +58,11 @@ haproxy h2 -arg "-L B" -conf {
 }
 
 haproxy h3 -arg "-L C" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 9f97ff54e5df62a0fff8540fb543523d8ea50b4c..d9640ff0f4c95d39e0f00ddd42e66253cb3c7a7f 100644 (file)
--- a/reg-tests/peers/basic_sync_wo_stkt_backend.vtc
+++ b/reg-tests/peers/basic_sync_wo_stkt_backend.vtc
@@ -4,6 +4,11 @@ feature ignore_unknown_macro
 #REGTEST_TYPE=slow
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -25,6 +30,11 @@ haproxy h1 -arg "-L A" -conf {
 }
 
 haproxy h2 -arg "-L B" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -45,6 +55,11 @@ haproxy h2 -arg "-L B" -conf {
 }
 
 haproxy h3 -arg "-L C" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 95e3d736e31c05e53291f46e5cdf95a2f62b7319..1618ef6db61edf5d8f1c34285a76f13bb7a45ac1 100644 (file)
--- a/reg-tests/peers/tls_basic_sync.vtc
+++ b/reg-tests/peers/tls_basic_sync.vtc
@@ -5,6 +5,11 @@ feature ignore_unknown_macro
 #REGTEST_TYPE=slow
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -29,6 +34,11 @@ haproxy h1 -arg "-L A" -conf {
 }
 
 haproxy h2 -arg "-L B" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -53,6 +63,11 @@ haproxy h2 -arg "-L B" -conf {
 }
 
 haproxy h3 -arg "-L C" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -77,6 +92,11 @@ haproxy h3 -arg "-L C" -conf {
 }
 
 haproxy h4 -arg "-L D" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 bf467084b8cf467c6aef14876d77d894ab7e376b..2b5bcacbe0ebffc780843ebafed811de591b217a 100644 (file)
--- a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
+++ b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
@@ -5,6 +5,11 @@ feature ignore_unknown_macro
 #REGTEST_TYPE=slow
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -27,6 +32,11 @@ haproxy h1 -arg "-L A" -conf {
 }
 
 haproxy h2 -arg "-L B" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -49,6 +59,11 @@ haproxy h2 -arg "-L B" -conf {
 }
 
 haproxy h3 -arg "-L C" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -71,6 +86,11 @@ haproxy h3 -arg "-L C" -conf {
 }
 
 haproxy h4 -arg "-L D" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 21e6f4b52417a700bc75f153890afa46280d5f6a..9d9289ceda27daffc6ca3c0aaf35b05f7adeef44 100644 (file)
--- a/reg-tests/sample_fetches/acl.vtc
+++ b/reg-tests/sample_fetches/acl.vtc
@@ -4,6 +4,11 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.9-dev2)'"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 ea85d6cfb756ccc40e768d62bf217876a645408b..b45a6d194863a7320c6bd9eca1f9f3bcc51b6f5c 100644 (file)
--- a/reg-tests/sample_fetches/cond_set_var.vtc
+++ b/reg-tests/sample_fetches/cond_set_var.vtc
@@ -29,6 +29,10 @@ server s1 -repeat 10 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         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 c1d26ada82f05a86cda122c5dcafabadae3f08e5..fc596eb737088e07b7fa3f79312822e1b6a1760a 100644 (file)
--- a/reg-tests/sample_fetches/cook.vtc
+++ b/reg-tests/sample_fetches/cook.vtc
@@ -10,6 +10,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
        timeout client 30s
        timeout server 30s
@@ -52,6 +57,11 @@ server s2 {
 } -start
 
 haproxy h2 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
        timeout client 30s
        timeout server 30s
@@ -84,6 +94,11 @@ server s3 {
 } -start
 
 haproxy h3 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
        timeout client 30s
        timeout server 30s
@@ -119,6 +134,11 @@ server s4 {
 } -start
 
 haproxy h4 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
        timeout client 30s
        timeout server 30s

diff --git a/reg-tests/sample_fetches/hashes.vtc b/reg-tests/sample_fetches/hashes.vtc
index e8f97b9d871bcb63ca9f10b64e20aefbc14a0ce5..eeb8965034b6e1d0225767ffcc8c93e5e52e7c84 100644 (file)
--- a/reg-tests/sample_fetches/hashes.vtc
+++ b/reg-tests/sample_fetches/hashes.vtc
@@ -8,6 +8,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 eea17b188fb72d781b916b0394f7c7215f8cb74f..7452e76a0e6d9b1760a1b1e1e034113d50a9f16f 100644 (file)
--- a/reg-tests/sample_fetches/so_name.vtc
+++ b/reg-tests/sample_fetches/so_name.vtc
@@ -3,6 +3,11 @@ varnishtest "so_name sample fetche Test"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 08233aac7be8dc97bd0f52b22bf4fed9bcd20af8..62714a22da90817295466d40688ea986fcb5f438 100644 (file)
--- a/reg-tests/sample_fetches/srv_name.vtc
+++ b/reg-tests/sample_fetches/srv_name.vtc
@@ -13,6 +13,11 @@ server s2 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 e21c542c0ec2f4632144e97ae17e71e697cdd3cf..cfab9c59abf6bfd8db78f5c14746e979e8b60b53 100644 (file)
--- a/reg-tests/sample_fetches/tcpinfo_rtt.vtc
+++ b/reg-tests/sample_fetches/tcpinfo_rtt.vtc
@@ -9,6 +9,11 @@ server s1 {
 }  -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   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 9312b1df91be553db0c1e6e60bc696a898e13a0e..625f729e42174de39f2f9dd43cd229f8fb07609e 100644 (file)
--- a/reg-tests/sample_fetches/tlvs.vtc
+++ b/reg-tests/sample_fetches/tlvs.vtc
@@ -2,6 +2,11 @@ varnishtest "Tests for fetching PROXY protocol v2 TLVs"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 dd7eefb7b6b7d254afb2661813a437f23f5b3a3f..aaada6f9aa0b09907310a43b3af8ff75f2d72b0d 100644 (file)
--- a/reg-tests/sample_fetches/ubase64.vtc
+++ b/reg-tests/sample_fetches/ubase64.vtc
@@ -4,6 +4,10 @@ feature ignore_unknown_macro
 
 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.

diff --git a/reg-tests/sample_fetches/vars.vtc b/reg-tests/sample_fetches/vars.vtc
index 29d474cf2c7cd6fa30d56ee967d3d41528196f77..2019d587943d42eb57ffc96f14b8b0e01fd75a9c 100644 (file)
--- a/reg-tests/sample_fetches/vars.vtc
+++ b/reg-tests/sample_fetches/vars.vtc
@@ -5,6 +5,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         # note below, str60 is purposely not defined so that the default is used
         set-var proc.int12 int(12)
         set-var proc.int5  var(proc.str60,60),div(proc.int12)

diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc
index 0e8a7f3d7281feafa862a0441b307fd652fc7995..9cc59a0990b708c3d9e552fc5d1ba2e14081968d 100644 (file)
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -25,6 +25,10 @@ feature cmd "command -v grep"
 
 haproxy h1 -Ws -S -conf {
   global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners
 
   defaults

diff --git a/reg-tests/server/abnsz.vtc b/reg-tests/server/abnsz.vtc
index e1f3b1a7158d7cd6bac88b96ed1c4ff806a6a699..d296918f1a135d8b14cefe9e705a589843e8483f 100644 (file)
--- a/reg-tests/server/abnsz.vtc
+++ b/reg-tests/server/abnsz.vtc
@@ -8,6 +8,10 @@ feature cmd "command -v curl"
 
 haproxy h1 -Ws -S -conf {
   global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners
 
   defaults

diff --git a/reg-tests/server/cli_add_check_server.vtc b/reg-tests/server/cli_add_check_server.vtc
index e5b26d76bde3f95a6044f40bea41597b1f6f7e92..bd1157e4e136da31e3480d508727aab37ad95b7c 100644 (file)
--- a/reg-tests/server/cli_add_check_server.vtc
+++ b/reg-tests/server/cli_add_check_server.vtc
@@ -64,6 +64,10 @@ syslog S1 -level notice {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                stats socket "${tmpdir}/h1/stats" level admin
 
        defaults

diff --git a/reg-tests/server/cli_add_server.vtc b/reg-tests/server/cli_add_server.vtc
index 5722454367d8d44b0c94ba5e5a50e0d8c847904b..8081312ba901f8b0c88c60464acb834a801fc4e2 100644 (file)
--- a/reg-tests/server/cli_add_server.vtc
+++ b/reg-tests/server/cli_add_server.vtc
@@ -8,6 +8,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 48faee13ccfeb3da4b8927bd3e515dc9e1b7f8ce..bfff7af7d206341245263953cd61936d2883e8f4 100644 (file)
--- a/reg-tests/server/cli_add_ssl_server.vtc
+++ b/reg-tests/server/cli_add_ssl_server.vtc
@@ -25,6 +25,10 @@ syslog S1 -level notice {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                stats socket "${tmpdir}/h1/stats" level admin
 
        defaults

diff --git a/reg-tests/server/cli_add_track_server.vtc b/reg-tests/server/cli_add_track_server.vtc
index 2377fb2e48ebddc8f25baf61e2cdee768798362a..28964bc5a28431b2e231f34f0d9b752b1b3a9261 100644 (file)
--- a/reg-tests/server/cli_add_track_server.vtc
+++ b/reg-tests/server/cli_add_track_server.vtc
@@ -91,6 +91,10 @@ syslog S3 {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                stats socket "${tmpdir}/h1/stats" level admin
 
        defaults

diff --git a/reg-tests/server/cli_delete_dynamic_server.vtc b/reg-tests/server/cli_delete_dynamic_server.vtc
index ef3ef3ff182026897c1aca725bf56c092cf9a760..78245ac64957164f1f06332df67a530b85f0225f 100644 (file)
--- a/reg-tests/server/cli_delete_dynamic_server.vtc
+++ b/reg-tests/server/cli_delete_dynamic_server.vtc
@@ -20,6 +20,11 @@ server s2 -repeat 3 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 61d241c2afb024ad408a003e3853b743d9aad3e6..7effb2d47d43baa84c2a7ab8bc18593c82483f4c 100644 (file)
--- a/reg-tests/server/cli_delete_server.vtc
+++ b/reg-tests/server/cli_delete_server.vtc
@@ -7,6 +7,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}"

diff --git a/reg-tests/server/cli_set_fqdn.vtc b/reg-tests/server/cli_set_fqdn.vtc
index f82674f30ee8bc40a53d25f2bf82cdee53bc43d6..72695769fabbf27f18d558ca8871cd8d6ce4c352 100644 (file)
--- a/reg-tests/server/cli_set_fqdn.vtc
+++ b/reg-tests/server/cli_set_fqdn.vtc
@@ -10,6 +10,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -25,6 +30,11 @@ haproxy h1 -conf {
 } -start
 
 haproxy h2 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 d05021d4d23623960f16cb3378b6cc20552171f3..3f35d0921a50ade9dfe826d577b9f52d8c0a7003 100644 (file)
--- a/reg-tests/server/cli_set_ssl.vtc
+++ b/reg-tests/server/cli_set_ssl.vtc
@@ -12,6 +12,10 @@ server s1 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         ssl-server-verify none
 
     defaults

diff --git a/reg-tests/spoe/wrong_init.vtc b/reg-tests/spoe/wrong_init.vtc
index 152622c5e46756d10544ec96b66c95aa5952a558..6b2a218e3644903aee1dcc234c270e262d593e3a 100644 (file)
--- a/reg-tests/spoe/wrong_init.vtc
+++ b/reg-tests/spoe/wrong_init.vtc
@@ -12,6 +12,11 @@ varnishtest "SPOE bug: missing configuration file"
 feature ignore_unknown_macro
 
 haproxy h1 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 6c6379ec33f59c0a589fc42214263787da752e3d..5dd2d9506b396cf5ca77be3c47a132df8fa02ce3 100644 (file)
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@@ -22,6 +22,10 @@ server s1 -repeat 2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/crt_store.vtc b/reg-tests/ssl/crt_store.vtc
index a07ec4e2a2a860bdd810816f0e0e12fdb7e08161..eecdcc45d0bbbfc69c885f1d06f4ee1c4cc2c5dd 100644 (file)
--- a/reg-tests/ssl/crt_store.vtc
+++ b/reg-tests/ssl/crt_store.vtc
@@ -11,6 +11,11 @@ feature ignore_unknown_macro
 
 
 haproxy h1 -arg -V -conf-OK {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-store
        load crt "${testdir}/common.crt" key "${testdir}/common.key"
 

diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc b/reg-tests/ssl/del_ssl_crt-list.vtc
index d711475eae39fc4962fbf928bbdcf4c5f0a77fa3..df0a51a21c5e8f6a946c821ed4c2c8f77525982a 100644 (file)
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@@ -20,6 +20,10 @@ server s1 -repeat 2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/dynamic_server_ssl.vtc b/reg-tests/ssl/dynamic_server_ssl.vtc
index 6c79b6d9a3eae8385387f80bffc917e2d124eaa6..2529e9450fde5e1a9d510322406f9a96c5cb9ceb 100644 (file)
--- a/reg-tests/ssl/dynamic_server_ssl.vtc
+++ b/reg-tests/ssl/dynamic_server_ssl.vtc
@@ -18,6 +18,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                stats socket "${tmpdir}/h1/stats" level admin
 
        defaults

diff --git a/reg-tests/ssl/issuers_chain_path.vtc b/reg-tests/ssl/issuers_chain_path.vtc
index 9fa90673f6bbaedd8c6b63f3fc16f513137e5e4a..ee63b9a1ea037d87f16e3064e6cc55d8ba36f00c 100644 (file)
--- a/reg-tests/ssl/issuers_chain_path.vtc
+++ b/reg-tests/ssl/issuers_chain_path.vtc
@@ -9,6 +9,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         stats socket "${tmpdir}/h1/stats" level admin
         issuers-chain-path "${testdir}/issuers-chain-path/ca/"
         crt-base "${testdir}/issuers-chain-path"

diff --git a/reg-tests/ssl/log_forward_ssl.vtc b/reg-tests/ssl/log_forward_ssl.vtc
index 6b7515bf870cb702fbf6bbe1cb2ebeb274987d70..0d59780ded7993a80816bb466f7630a7f1b43564 100644 (file)
--- a/reg-tests/ssl/log_forward_ssl.vtc
+++ b/reg-tests/ssl/log_forward_ssl.vtc
@@ -15,6 +15,10 @@ syslog Slg1 -level info {
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                insecure-fork-wanted
        defaults
                mode http

diff --git a/reg-tests/ssl/new_del_ssl_cafile.vtc b/reg-tests/ssl/new_del_ssl_cafile.vtc
index 7e8a9f19d0d1f2dc9d0393c26083767d177d0a0f..f81bf7ee0a08d65dc3629c82a8b7e1da2583addf 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_cafile.vtc
+++ b/reg-tests/ssl/new_del_ssl_cafile.vtc
@@ -21,6 +21,10 @@ server s1 -repeat 2 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/new_del_ssl_crlfile.vtc b/reg-tests/ssl/new_del_ssl_crlfile.vtc
index 8575f26449822f71d5bcf540a7af2210dd0ed870..42bc088101a330bbfe5a768f02a15c00d64f7783 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_crlfile.vtc
+++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc
@@ -21,6 +21,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ocsp_auto_update.vtc b/reg-tests/ssl/ocsp_auto_update.vtc
index f76630967557e58cf1e9ed45b16aa0cce905bf00..7101497941e54d5f9b16a879427a0644f7ab84e1 100644 (file)
--- a/reg-tests/ssl/ocsp_auto_update.vtc
+++ b/reg-tests/ssl/ocsp_auto_update.vtc
@@ -47,6 +47,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif
@@ -117,6 +121,10 @@ syslog Syslog_ocsp -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
@@ -186,6 +194,10 @@ syslog Syslog_ocsp3 -level notice {
 
 haproxy h3 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif
@@ -260,6 +272,10 @@ syslog Syslog_ocsp4 -level notice {
 
 haproxy h4 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif
@@ -376,6 +392,10 @@ syslog Syslog_ocsp5 -level notice {
 
 haproxy h5 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif
@@ -460,6 +480,10 @@ syslog Syslog_ocsp6 -level notice {
 
 haproxy h6 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif
@@ -538,6 +562,10 @@ syslog Syslog_ocsp7 -level notice {
 
 haproxy h7 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif
@@ -603,6 +631,10 @@ process p7 -wait
 
 haproxy h8 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif
@@ -699,6 +731,10 @@ syslog Syslog_ocsp9 -level notice {
 
 haproxy h9 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ocsp_compat_check.vtc b/reg-tests/ssl/ocsp_compat_check.vtc
index f96fedef4c5831026692e2d36f31f6fa78dd1a84..2768821aa4ce776e2f52d617803b58d6ab752267 100644 (file)
--- a/reg-tests/ssl/ocsp_compat_check.vtc
+++ b/reg-tests/ssl/ocsp_compat_check.vtc
@@ -36,6 +36,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
 #    ocsp-update.mode on
 
@@ -67,6 +71,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
     ocsp-update.mode on
 
@@ -98,6 +106,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
     ocsp-update.mode off
 
@@ -129,6 +141,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
 #    ocsp-update.mode off
 
@@ -161,6 +177,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
     ocsp-update.mode on
 
@@ -193,6 +213,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
     ocsp-update.mode off
 
@@ -227,6 +251,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
 #    ocsp-update.mode off
 
@@ -259,6 +287,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
 #    ocsp-update.mode off
 
@@ -292,6 +324,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
     ocsp-update.mode on
 
@@ -325,6 +361,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
     ocsp-update.mode on
 
@@ -358,6 +398,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
     ocsp-update.mode off
 
@@ -391,6 +435,10 @@ EOF
 
     cat << EOF > ${tmpdir}/ocsp_compat_check.cfg
 global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     crt-base ${testdir}/ocsp_update/multicert
     ocsp-update.mode off
 

diff --git a/reg-tests/ssl/set_ssl_bug_2265.vtc b/reg-tests/ssl/set_ssl_bug_2265.vtc
index c773f134ca3d781b64b2673ae3ffd332075ed7c5..2bd8652b3471e844c7aa2eb1e4bb67679b8bec3b 100644 (file)
--- a/reg-tests/ssl/set_ssl_bug_2265.vtc
+++ b/reg-tests/ssl/set_ssl_bug_2265.vtc
@@ -25,6 +25,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc
index 2e5aebbdaa2f4b9c2c68fde9b872a00fc2a0cc8c..897fe5e407c7aaca1ba11e2f1aa381d964c061f0 100644 (file)
--- a/reg-tests/ssl/set_ssl_cafile.vtc
+++ b/reg-tests/ssl/set_ssl_cafile.vtc
@@ -27,6 +27,10 @@ server s1 -repeat 4 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index 6373498dee2634b22abe46c5bffaf3a134771451..bdc5fba59eee4777595e4c3c6ad660f89410ee79 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@@ -31,6 +31,10 @@ server s1 -repeat 9 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/set_ssl_cert_bundle.vtc b/reg-tests/ssl/set_ssl_cert_bundle.vtc
index 3b3c0b343a654d99e9d98be03165dbe3afe9e2e2..8e145ef73897c56d41ebc6c6bee3807fe16da626 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_bundle.vtc
+++ b/reg-tests/ssl/set_ssl_cert_bundle.vtc
@@ -28,6 +28,10 @@ server s1 -repeat 9 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc b/reg-tests/ssl/set_ssl_cert_noext.vtc
index ed5fdb5c735ed9f4ee4664472e6bbf02f0937689..65773d89e0eef33012bcb2eb8f177f90169fb061 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@@ -23,6 +23,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc b/reg-tests/ssl/set_ssl_crlfile.vtc
index 86cab001735516ea2ef7b6f5baf7c7948ced8006..05ff673821b70faa78834e72ba4b17dc970bc8cf 100644 (file)
--- a/reg-tests/ssl/set_ssl_crlfile.vtc
+++ b/reg-tests/ssl/set_ssl_crlfile.vtc
@@ -30,6 +30,10 @@ server s1 -repeat 4 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/set_ssl_server_cert.vtc b/reg-tests/ssl/set_ssl_server_cert.vtc
index 55d8df0efa2c96e19172f9d66a93eead0a82676e..db23e705b215f125a94f939d9cc2b2f0d4da3855 100644 (file)
--- a/reg-tests/ssl/set_ssl_server_cert.vtc
+++ b/reg-tests/ssl/set_ssl_server_cert.vtc
@@ -16,6 +16,10 @@ server s1 -repeat 4 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/show_ssl_ocspresponse.vtc b/reg-tests/ssl/show_ssl_ocspresponse.vtc
index 08969ba2b32f090246bfa0231dee55d48e788245..47d2ec0024d7f9fda7a7cf924d56b8fe35161c4d 100644 (file)
--- a/reg-tests/ssl/show_ssl_ocspresponse.vtc
+++ b/reg-tests/ssl/show_ssl_ocspresponse.vtc
@@ -27,6 +27,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_alpn.vtc b/reg-tests/ssl/ssl_alpn.vtc
index 9d032769c8daf4b44168a7b5cd0c24b6b9e372ad..36cbc38e7b77b04c316e6293194d21b35d282af3 100644 (file)
--- a/reg-tests/ssl/ssl_alpn.vtc
+++ b/reg-tests/ssl/ssl_alpn.vtc
@@ -11,6 +11,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_client_auth.vtc b/reg-tests/ssl/ssl_client_auth.vtc
index a223a9c18ba886e097bf9171aa8165b2bcc77374..ec555651d7704026c59fe8aa711621e075191ae6 100644 (file)
--- a/reg-tests/ssl/ssl_client_auth.vtc
+++ b/reg-tests/ssl/ssl_client_auth.vtc
@@ -25,6 +25,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_client_samples.vtc b/reg-tests/ssl/ssl_client_samples.vtc
index 6b770822c94eb9704b38aa9a4ff146063467a049..db3589f36b59a8f1792fd8a87ccda4a771e4674f 100644 (file)
--- a/reg-tests/ssl/ssl_client_samples.vtc
+++ b/reg-tests/ssl/ssl_client_samples.vtc
@@ -12,6 +12,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_crt-list_filters.vtc b/reg-tests/ssl/ssl_crt-list_filters.vtc
index 843d85af47a7d3a35c1b27cee2f0a0730660a7bc..a911f03955564c94470a174f8afc4fb5827edb54 100644 (file)
--- a/reg-tests/ssl/ssl_crt-list_filters.vtc
+++ b/reg-tests/ssl/ssl_crt-list_filters.vtc
@@ -16,6 +16,10 @@ server s1 -repeat 6 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_curve_name.vtc b/reg-tests/ssl/ssl_curve_name.vtc
index 551679177e6651604960a8b63c1c1adc2c6041fe..68587148e6373ca714d807428ff76e3e9f1d91f7 100644 (file)
--- a/reg-tests/ssl/ssl_curve_name.vtc
+++ b/reg-tests/ssl/ssl_curve_name.vtc
@@ -11,6 +11,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_curves.vtc b/reg-tests/ssl/ssl_curves.vtc
index 5ffd2d8bdfe0313e05e2844e10b1f92041664569..da0054e7ea96694bb58d1dad27f83e706b024e5d 100644 (file)
--- a/reg-tests/ssl/ssl_curves.vtc
+++ b/reg-tests/ssl/ssl_curves.vtc
@@ -39,6 +39,10 @@ syslog Slg_cust_fmt -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

diff --git a/reg-tests/ssl/ssl_default_server.vtc b/reg-tests/ssl/ssl_default_server.vtc
index 88a3ccbe4d5fe17aac16106daeb12d53704b6817..0f49b1b808544b43d79141b3baa076ef5fd9490a 100644 (file)
--- a/reg-tests/ssl/ssl_default_server.vtc
+++ b/reg-tests/ssl/ssl_default_server.vtc
@@ -22,6 +22,10 @@ server s1 -repeat 7 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_dh.vtc b/reg-tests/ssl/ssl_dh.vtc
index 5fe7c88aa2fb192e0b2f13262997dbc5b942ea52..b569f8a1d167728d658e22f72538c81c97eebbfc 100644 (file)
--- a/reg-tests/ssl/ssl_dh.vtc
+++ b/reg-tests/ssl/ssl_dh.vtc
@@ -31,6 +31,10 @@ server s1 -repeat 8 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         stats socket "${tmpdir}/h1/stats" level admin
 
     defaults
@@ -67,9 +71,17 @@ haproxy h1 -conf {
 
 haproxy h2 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         stats socket "${tmpdir}/h2/stats" level admin
 
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         tune.ssl.default-dh-param 4096
 
     defaults
@@ -94,9 +106,17 @@ haproxy h2 -conf {
 
 haproxy h3 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         stats socket "${tmpdir}/h3/stats" level admin
 
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
         ssl-dh-param-file ${testdir}/common.4096.dh
 
     defaults

diff --git a/reg-tests/ssl/ssl_errors.vtc b/reg-tests/ssl/ssl_errors.vtc
index a3c54553c679e1b550998f97f46acf776175a238..8025dbd96f06e98e9a288ca5afd2e339e3e15f66 100644 (file)
--- a/reg-tests/ssl/ssl_errors.vtc
+++ b/reg-tests/ssl/ssl_errors.vtc
@@ -168,6 +168,10 @@ syslog Slg_bcknd_fe -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
@@ -227,7 +231,7 @@ haproxy h1 -conf {
         server wrong_ciphers2 "${tmpdir}/wrong_ciphers_ssl.sock" ssl verify none crt ${testdir}/client1.pem ca-file ${testdir}/ca-auth.crt force-tlsv12 ciphers "aECDSA" sni str(foo.com)
 .else
         server wrong_ciphers_tls13 "${tmpdir}/wrong_ciphers_tls13_ssl.sock" ssl verify none crt ${testdir}/client1.pem ca-file ${testdir}/ca-auth.crt ciphersuites "TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256" force-tlsv13 sni str(foo.com)
-.endif
+    .endif
 
 
 
@@ -293,7 +297,7 @@ haproxy h1 -conf {
     listen wrong_ciphers_tls13_ssl_lst from bknd_err_dflt
         bind "${tmpdir}/wrong_ciphers_tls13_ssl.sock" ssl crt ${testdir}/common.pem ca-file ${testdir}/ca-auth.crt verify none force-tlsv13 ciphersuites "TLS_AES_128_GCM_SHA256"
         server s1 ${s1_addr}:${s1_port}
-.endif
+    .endif
 
 } -start
 

diff --git a/reg-tests/ssl/ssl_frontend_samples.vtc b/reg-tests/ssl/ssl_frontend_samples.vtc
index 56a208bccdd8ee97c91b8806c2ae70e289725225..118795b15bd1e670e2ac57d0a35659fcb669f346 100644 (file)
--- a/reg-tests/ssl/ssl_frontend_samples.vtc
+++ b/reg-tests/ssl/ssl_frontend_samples.vtc
@@ -11,6 +11,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_generate_certificate.vtc b/reg-tests/ssl/ssl_generate_certificate.vtc
index ace27d877bdc0863780d7ec3b16ca274724f6355..0bd6fbc44898ec66fd0ad5708f38b6186ed559a5 100644 (file)
--- a/reg-tests/ssl/ssl_generate_certificate.vtc
+++ b/reg-tests/ssl/ssl_generate_certificate.vtc
@@ -27,6 +27,10 @@ server s1 -repeat 6 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_reuse.vtc b/reg-tests/ssl/ssl_reuse.vtc
index d7244eeb4d88517b07f0f3989487c0769e197ffa..57ef5f62ce5a43f02e69e167d4f8220cd3a91da1 100644 (file)
--- a/reg-tests/ssl/ssl_reuse.vtc
+++ b/reg-tests/ssl/ssl_reuse.vtc
@@ -15,6 +15,10 @@ server s1 -repeat 84 {
 
 haproxy h1 -conf {
    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
       # 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 2841d1cc63527392d3315ba0d902b84a8545a193..c8c52081bf90656bd2efabf77af1123ed1f4219d 100644 (file)
--- a/reg-tests/ssl/ssl_server_samples.vtc
+++ b/reg-tests/ssl/ssl_server_samples.vtc
@@ -11,6 +11,10 @@ server s1 -repeat 3 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc b/reg-tests/ssl/ssl_simple_crt-list.vtc
index d70327b0b17676d94a51e61422b79335686ff151..fa6c767b12ab749af8e4a591b73c375d6d100fb7 100644 (file)
--- a/reg-tests/ssl/ssl_simple_crt-list.vtc
+++ b/reg-tests/ssl/ssl_simple_crt-list.vtc
@@ -12,6 +12,10 @@ server s1 -repeat 4 {
 
 haproxy h1 -conf {
     global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     .if !ssllib_name_startswith(AWS-LC)
         tune.ssl.default-dh-param 2048
     .endif

diff --git a/reg-tests/ssl/wrong_ctx_storage.vtc b/reg-tests/ssl/wrong_ctx_storage.vtc
index 4275731fe60f448b1c66472cfae473dd30c3625f..1522e0211c96dcc588b5a0fff0ddbf6c9b07fb49 100644 (file)
--- a/reg-tests/ssl/wrong_ctx_storage.vtc
+++ b/reg-tests/ssl/wrong_ctx_storage.vtc
@@ -24,6 +24,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
   global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   .if !ssllib_name_startswith(AWS-LC)
     tune.ssl.default-dh-param 2048
   .endif

diff --git a/reg-tests/startup/automatic_maxconn.vtc b/reg-tests/startup/automatic_maxconn.vtc
index 0173916198c569b54d32953f9935705a94230607..2b47ee166f2b1e0d79f503ce18ecb28850e5e5fc 100644 (file)
--- a/reg-tests/startup/automatic_maxconn.vtc
+++ b/reg-tests/startup/automatic_maxconn.vtc
@@ -45,6 +45,11 @@ haproxy h3 -cli {
 # 1 SSL front but no back
 
 haproxy h4 -arg "-m 256" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
                mode http
                timeout connect 1s
@@ -64,6 +69,11 @@ haproxy h4 -cli {
 # 1 SSL back but not front
 
 haproxy h5 -arg "-m 256" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
                mode http
                timeout connect 1s
@@ -85,6 +95,11 @@ haproxy h5 -cli {
 # 1 SSL front and 1 back
 
 haproxy h6 -arg "-m 256" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        defaults
                mode http
                timeout connect 1s

diff --git a/reg-tests/startup/default_rules.vtc b/reg-tests/startup/default_rules.vtc
index 654e9cf3db116cf280ce393ee6d1623623f7b611..1774872db69032dc3bad5c6de61bf9c5145b62e8 100644 (file)
--- a/reg-tests/startup/default_rules.vtc
+++ b/reg-tests/startup/default_rules.vtc
@@ -7,37 +7,72 @@ feature ignore_unknown_macro
 # anonymous defaults section cannot define TCP/HTTP rules
 #
 haproxy h1 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         http-request set-header X-Hdr 1
 }
 
 haproxy h2 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         http-response set-header X-Hdr 1
 }
 
 haproxy h3 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         http-after-request set-header X-Hdr 1
 }
 
 haproxy h4 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         tcp-request connection accept
 }
 
 haproxy h5 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         tcp-request session accept
 }
 
 haproxy h6 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         tcp-request inspect-delay 5s
         tcp-request content accept
 }
 
 haproxy h7 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         tcp-response inspect-delay 5s
         tcp-response content accept
@@ -48,6 +83,11 @@ haproxy h7 -conf-BAD {} {
 # defaults section
 #
 haproxy h8 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults invalid
         tcp-response inspect-delay 5s
         tcp-response content accept
@@ -61,6 +101,11 @@ haproxy h8 -conf-BAD {} {
 # section
 #
 haproxy h9 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults invalid
         tcp-request inspect-delay 5s
         tcp-request content accept
@@ -77,6 +122,11 @@ haproxy h9 -conf-BAD {} {
 #
 #
 haproxy h10 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults invalid
         tcp-request inspect-delay 5s
         tcp-request content accept
@@ -96,6 +146,11 @@ haproxy h10 -conf-BAD {} {
 # rules cannot be used to init backend sections
 #
 haproxy h11 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults invalid
         tcp-request connection accept
 
@@ -105,6 +160,11 @@ haproxy h11 -conf-BAD {} {
 }
 
 haproxy h12 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults invalid
         tcp-request session accept
 
@@ -118,6 +178,11 @@ haproxy h12 -conf-BAD {} {
 # a frontend section
 #
 haproxy h13 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults invalid
         tcp-response inspect-delay 5s
         tcp-response content accept
@@ -128,6 +193,11 @@ haproxy h13 -conf-BAD {} {
 }
 
 haproxy h14 -arg -V -conf-OK {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults tcp
        timeout client 30s
        timeout server 30s
@@ -146,6 +216,11 @@ haproxy h14 -arg -V -conf-OK {
 #
 
 haproxy h15 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults invalid
         mode http
         http-request set-header x-test "%[srv_conn(www)]"
@@ -155,6 +230,11 @@ haproxy h15 -conf-BAD {} {
 }
 
 haproxy h16 -conf-BAD {} {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults invalid
         mode http
         http-request track-sc0 src
@@ -166,6 +246,11 @@ haproxy h16 -conf-BAD {} {
 }
 
 haproxy h17 -arg -V -conf-OK {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults common
        timeout client 30s
        timeout server 30s

diff --git a/reg-tests/stats/stats-file.vtc b/reg-tests/stats/stats-file.vtc
index 8e4aaa9f34f55cc28cae61271565dca810614d74..fab008b954d2468d3a12ec30eb942053fcd930b2 100644 (file)
--- a/reg-tests/stats/stats-file.vtc
+++ b/reg-tests/stats/stats-file.vtc
@@ -5,6 +5,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
        global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
                stats-file ${testdir}/sample-stats-file
 
        defaults

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 9f39d826e883b6be704f976a4c64d28a76c0b89e..b409ea0204c4ac050e4a1f3e45930f3dc26b57e9 100644 (file)
--- a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
+++ b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
@@ -27,6 +27,11 @@ server s1 {
 
 haproxy h1 -conf {
     # Configuration file of 'h1' haproxy instance.
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode   http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

diff --git a/reg-tests/stick-table/src_conn_rate.vtc b/reg-tests/stick-table/src_conn_rate.vtc
index bdf8869bee30bbb154107aba886e64166610b42a..9ec475b6343cf78ba9482af4152202b2946d8da7 100644 (file)
--- a/reg-tests/stick-table/src_conn_rate.vtc
+++ b/reg-tests/stick-table/src_conn_rate.vtc
@@ -2,6 +2,11 @@ varnishtest "stick table: src_conn_rate"
 feature ignore_unknown_macro
 
 haproxy h0 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 f0307cb210075e880944713647c34d8c5c4bd60c..3a86963de97123a013005aa45f744ee3ffa13d35 100644 (file)
--- a/reg-tests/stick-table/unknown_key.vtc
+++ b/reg-tests/stick-table/unknown_key.vtc
@@ -11,6 +11,11 @@ server s0 {
 } -start
 
 haproxy h0 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
        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 23c9a9afd1dc38de54b441ad73a286e077ce8342..a515118695c972fb0e38a9c9630de544c3edf64f 100644 (file)
--- a/reg-tests/stickiness/lb-services.vtc
+++ b/reg-tests/stickiness/lb-services.vtc
@@ -42,6 +42,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}"
@@ -105,6 +110,11 @@ server s8 {
 
 
 haproxy h2 -arg "-L B" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 cf9c313f5d31158069f1e19010fabc7b0cab463c..fdb00f9acebc70baccce3541c54e92e633e28a80 100644 (file)
--- a/reg-tests/stickiness/srvkey-addr.vtc
+++ b/reg-tests/stickiness/srvkey-addr.vtc
@@ -31,6 +31,11 @@ server s2 {
 } -repeat 8 -start
 
 haproxy h1 -arg "-L A" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     defaults
         mode http
         timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -72,6 +77,11 @@ haproxy h1 -arg "-L A" -conf {
 }
 
 haproxy h2 -arg "-L B" -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 fc91f257d0f9fa7ce83f5d721a2e4180e0db1403..9b3ffd164fa1ed95550971932e84d5460d64aff5 100644 (file)
--- a/reg-tests/stream/unique-id-from-proxy.vtc
+++ b/reg-tests/stream/unique-id-from-proxy.vtc
@@ -3,6 +3,11 @@ varnishtest "Check that we are able to read a unique-id from PROXYv2"
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
     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 0607b2a4fa620a9f75ec7b81bb6e4679e3303e07..5b580af828dffd6b696475e2d82e6d8f9987c100 100644 (file)
--- a/reg-tests/stream/unique-id.vtc
+++ b/reg-tests/stream/unique-id.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}"

diff --git a/reg-tests/tcp-rules/default_rules.vtc b/reg-tests/tcp-rules/default_rules.vtc
index 8c05f4306bbfc921efce1afa1163bf4cd483bc45..b99a20fe8c679eaa76bff60493df92bdba69f1ae 100644 (file)
--- a/reg-tests/tcp-rules/default_rules.vtc
+++ b/reg-tests/tcp-rules/default_rules.vtc
@@ -11,6 +11,11 @@ server s1 {
 }  -start
 
 haproxy h1 -conf {
+    global
+    .if feature(THREAD)
+        thread-groups 1
+    .endif
+
   defaults common
       mode http
       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

diff --git a/reg-tests/webstats/webstats-scope-and-post-change.vtc b/reg-tests/webstats/webstats-scope-and-post-change.vtc
index 7830ae5b45dd150f19229dc5c94915f5668251d3..604abff4d18ab186c242dfb57ee532f2381a316c 100644 (file)
--- a/reg-tests/webstats/webstats-scope-and-post-change.vtc
+++ b/reg-tests/webstats/webstats-scope-and-post-change.vtc
@@ -7,6 +7,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.