CLEANUP: reg-tests: Remove obsolete no-htx parameter for reg-tests

The legacy HTTP subsystem has been removed. HTX is always enabled.

diff --git a/reg-tests/README b/reg-tests/README
index d05a2a8055718dc278d84da9d811ac104d9b02c4..6993d9782f28bab8817c6b73fb38ea8678037b52 100644 (file)
--- a/reg-tests/README
+++ b/reg-tests/README
@@ -38,7 +38,7 @@ See also: doc/regression-testing.txt
   You must set HAPROXY_PROGRAM environment variable to give the location
   of the HAProxy program to test to vtest:
 
-    $ HAPROXY_PROGRAM=<my haproxy program> vtest [-Dno-htx=] ...
+    $ HAPROXY_PROGRAM=<my haproxy program> vtest ...
 
   The HAProxy VTC files found in HAProxy sources may be run with the reg-tests
   Makefile target. You must set the VTEST_PROGRAM environment variable to

diff --git a/reg-tests/cache/basic.vtc b/reg-tests/cache/basic.vtc
index 849057d9e55f3b187736e007259603029e27dcc9..30f4631087fa6a3bd43c34c177df2169ba03f7a1 100644 (file)
--- a/reg-tests/cache/basic.vtc
+++ b/reg-tests/cache/basic.vtc
@@ -27,7 +27,6 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/cache/caching_rules.vtc b/reg-tests/cache/caching_rules.vtc
index 114b2fd91ab3fc8bb47d7feedd2d3c2beed2f5ad..c65bc4ba5d7a810666d8df1cd32afb316c2044b9 100644 (file)
--- a/reg-tests/cache/caching_rules.vtc
+++ b/reg-tests/cache/caching_rules.vtc
@@ -86,7 +86,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/cache/expires.vtc b/reg-tests/cache/expires.vtc
index 037f09fd0fbf540253c9206bba670c4746580ad8..309c4ae6ad275a50f4a422dde766837bfc7ecd61 100644 (file)
--- a/reg-tests/cache/expires.vtc
+++ b/reg-tests/cache/expires.vtc
@@ -48,7 +48,6 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout connect 1s
                timeout client  1s
                timeout server  1s

diff --git a/reg-tests/cache/if-modified-since.vtc b/reg-tests/cache/if-modified-since.vtc
index 8ae1cce5d1d8b31389217b00cc74685a5d9f21f0..d3c9b70edf93ed4b6bd0347ebf8af315bc2b6ac4 100644 (file)
--- a/reg-tests/cache/if-modified-since.vtc
+++ b/reg-tests/cache/if-modified-since.vtc
@@ -48,7 +48,6 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout connect 1s
                timeout client  1s
                timeout server  1s

diff --git a/reg-tests/cache/if-none-match.vtc b/reg-tests/cache/if-none-match.vtc
index ba3336a08c958b975f1993c768c61787e46bb2fe..bb5b9b567669f29cdf97151f72fffd1d75ef5de9 100644 (file)
--- a/reg-tests/cache/if-none-match.vtc
+++ b/reg-tests/cache/if-none-match.vtc
@@ -33,7 +33,6 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout connect 1s
                timeout client  1s
                timeout server  1s

diff --git a/reg-tests/cache/post_on_entry.vtc b/reg-tests/cache/post_on_entry.vtc
index db6414ed40cca05128855730d9a55698148320eb..b24cfd66607e4e233a45232c584e98006b67eeaa 100644 (file)
--- a/reg-tests/cache/post_on_entry.vtc
+++ b/reg-tests/cache/post_on_entry.vtc
@@ -25,7 +25,6 @@ server s1 {
 haproxy h1 -conf {
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout connect 1s
                timeout client  1s
                timeout server  1s

diff --git a/reg-tests/cache/sample_fetches.vtc b/reg-tests/cache/sample_fetches.vtc
index 973b3ad61e2dd8185eb534d83d31ab0c48354612..add6366eb41ae7f5fcd7d195eb0ad39a45680d6a 100644 (file)
--- a/reg-tests/cache/sample_fetches.vtc
+++ b/reg-tests/cache/sample_fetches.vtc
@@ -52,7 +52,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/cache/vary.vtc b/reg-tests/cache/vary.vtc
index 0b5d139410fa61efc5637c7d86538e5e86c94932..61d7af6710c1616db6e6a2af50c9718a230edcf4 100644 (file)
--- a/reg-tests/cache/vary.vtc
+++ b/reg-tests/cache/vary.vtc
@@ -135,7 +135,6 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout connect 1s
                timeout client  1s
                timeout server  1s

diff --git a/reg-tests/cache/vary_accept_encoding.vtc b/reg-tests/cache/vary_accept_encoding.vtc
index 852ac293e646192bdd43b738e5f86b1f580ece64..748c310c3a315934aaa6177d9611959b9002093a 100644 (file)
--- a/reg-tests/cache/vary_accept_encoding.vtc
+++ b/reg-tests/cache/vary_accept_encoding.vtc
@@ -100,7 +100,6 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout connect 1s
                timeout client  1s
                timeout server  1s

diff --git a/reg-tests/compression/basic.vtc b/reg-tests/compression/basic.vtc
index 6154e66c5ba12429c95e9bf8093044ec76ece59e..1df2293029227a741c4eed1fe72a560f8eca0fcd 100644 (file)
--- a/reg-tests/compression/basic.vtc
+++ b/reg-tests/compression/basic.vtc
@@ -180,7 +180,6 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/compression/etags_conversion.vtc b/reg-tests/compression/etags_conversion.vtc
index 48e7955fc4696545a86b74d5696632f3f8912866..901a5efa7c6e22282abb981fb34c9f87a94ff5d9 100644 (file)
--- a/reg-tests/compression/etags_conversion.vtc
+++ b/reg-tests/compression/etags_conversion.vtc
@@ -114,7 +114,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/compression/lua_validation.vtc b/reg-tests/compression/lua_validation.vtc
index af234b3d1c39b199ff0d2e31614eabcda6a5ee10..d001c2d32bb7af241af716830ff1a4de1a885db1 100644 (file)
--- a/reg-tests/compression/lua_validation.vtc
+++ b/reg-tests/compression/lua_validation.vtc
@@ -15,7 +15,6 @@ global
 defaults
        mode                    http
        log                     global
-       ${no-htx} option http-use-htx
        option                  httplog
 
 frontend main-https

diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc
index a905f9c9461588c3abba64658e6ae0da5f425079..ec6341b3f1aa233fe818b17af924dbcab007955f 100644 (file)
--- a/reg-tests/compression/vary.vtc
+++ b/reg-tests/compression/vary.vtc
@@ -69,7 +69,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/connection/dispatch.vtc b/reg-tests/connection/dispatch.vtc
index bac19d8fdfdf3bcec92037097f90bb971ef2dc3d..fccd6ec4b964fe01bfb8010f8a936ac65e0c5c29 100644 (file)
--- a/reg-tests/connection/dispatch.vtc
+++ b/reg-tests/connection/dispatch.vtc
@@ -26,7 +26,6 @@ listen fe_tcp
 listen fe_http
     bind "fd@${fe_http}"
     mode http
-    ${no-htx} option http-use-htx
     dispatch ${s2_addr}:${s2_port}
 } -start
 

diff --git a/reg-tests/connection/proxy_protocol_random_fail.vtc b/reg-tests/connection/proxy_protocol_random_fail.vtc
index 983857733fe4f6ca64c29610ba3ba7aab4e48e4a..135908e64b30d6903ba9935ca5feea40eaa51b8b 100644 (file)
--- a/reg-tests/connection/proxy_protocol_random_fail.vtc
+++ b/reg-tests/connection/proxy_protocol_random_fail.vtc
@@ -31,7 +31,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout client 1s
         timeout server 1s
         timeout connect 1s

diff --git a/reg-tests/filters/random-forwarding.vtc b/reg-tests/filters/random-forwarding.vtc
index 2982c880f3b46898b16c43b4ce824c6cca6edd6c..07dd2b85ce796cfcceb83b3bac254851c340d170 100644 (file)
--- a/reg-tests/filters/random-forwarding.vtc
+++ b/reg-tests/filters/random-forwarding.vtc
@@ -42,7 +42,6 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/http-capture/multiple_headers.vtc b/reg-tests/http-capture/multiple_headers.vtc
index 378838ee445d76f35909188fb15dc9ebb7fc42c2..f16b37ed91b5b2a8bf1718794f75da6aedab17b2 100644 (file)
--- a/reg-tests/http-capture/multiple_headers.vtc
+++ b/reg-tests/http-capture/multiple_headers.vtc
@@ -41,7 +41,6 @@ server s {
 haproxy h -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout client 1s
         timeout server 1s
         timeout connect 1s

diff --git a/reg-tests/http-cookies/cookie_insert_indirect.vtc b/reg-tests/http-cookies/cookie_insert_indirect.vtc
index f1afe9ecbe5d288b60022fb4687c91ef656359cc..3c4a06ad232f5015bec726d03a13d7269bbf447c 100644 (file)
--- a/reg-tests/http-cookies/cookie_insert_indirect.vtc
+++ b/reg-tests/http-cookies/cookie_insert_indirect.vtc
@@ -27,7 +27,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
                option httplog
         timeout client 1s
         timeout server 1s

diff --git a/reg-tests/http-messaging/h1_to_h1.vtc b/reg-tests/http-messaging/h1_to_h1.vtc
index c7d00858ea45add32945fd5418420a20548af9cd..4a442c79d7f4f260dd2c3bc967083d3ed9380144 100644 (file)
--- a/reg-tests/http-messaging/h1_to_h1.vtc
+++ b/reg-tests/http-messaging/h1_to_h1.vtc
@@ -123,7 +123,6 @@ haproxy h1 -conf {
 
     defaults
        mode http
-       ${no-htx} option http-use-htx
        timeout connect 1s
        timeout client  1s
        timeout server  1s

diff --git a/reg-tests/http-messaging/h2_to_h1.vtc b/reg-tests/http-messaging/h2_to_h1.vtc
index 0d2b1e5f225159bb8b4c503f2c63b085273f4759..a5e565732149be86b44964c33d0b05c6dedf3867 100644 (file)
--- a/reg-tests/http-messaging/h2_to_h1.vtc
+++ b/reg-tests/http-messaging/h2_to_h1.vtc
@@ -44,7 +44,6 @@ haproxy h1 -conf {
        #log stdout format raw daemon
        mode http
        option http-buffer-request
-       ${no-htx} option http-use-htx
        timeout connect 1s
        timeout client  1s
        timeout server  1s

diff --git a/reg-tests/http-messaging/http_abortonclose.vtc b/reg-tests/http-messaging/http_abortonclose.vtc
index 11efef7bb55c2819b417ed9fc771655cf6e1a7b1..49cdaeadd1c24822a25f6968940ce7ba6890417e 100644 (file)
--- a/reg-tests/http-messaging/http_abortonclose.vtc
+++ b/reg-tests/http-messaging/http_abortonclose.vtc
@@ -54,7 +54,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
         option abortonclose
         retries 3
         timeout client  10s

diff --git a/reg-tests/http-messaging/http_bodyless_response.vtc b/reg-tests/http-messaging/http_bodyless_response.vtc
index 6f36545f265ebaf0c419c1a1a5362095a960455e..2df824b2c550861b7d68ad652e164cb306d2a703 100644 (file)
--- a/reg-tests/http-messaging/http_bodyless_response.vtc
+++ b/reg-tests/http-messaging/http_bodyless_response.vtc
@@ -38,7 +38,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/http-messaging/http_request_buffer.vtc b/reg-tests/http-messaging/http_request_buffer.vtc
index 5542e26279e2495a478cda3c246f969ef6dc2463..1ac04c7ac6dd7e8c9c3a9977266f709016797d98 100644 (file)
--- a/reg-tests/http-messaging/http_request_buffer.vtc
+++ b/reg-tests/http-messaging/http_request_buffer.vtc
@@ -25,7 +25,6 @@ syslog S -level info {
 haproxy h1 -conf {
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout client  100ms
                timeout server  1s
                timeout connect 1s

diff --git a/reg-tests/http-messaging/http_wait_for_body.vtc b/reg-tests/http-messaging/http_wait_for_body.vtc
index 1313c9bfcdc02fb255ec786d0282bdd2c449d63e..be1ca5b02594d38460de6317f14e8292f9bb697b 100644 (file)
--- a/reg-tests/http-messaging/http_wait_for_body.vtc
+++ b/reg-tests/http-messaging/http_wait_for_body.vtc
@@ -72,7 +72,6 @@ server s2 {
 haproxy h1 -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout client  1s
         timeout server  1s
         timeout connect 1s

diff --git a/reg-tests/http-messaging/protocol_upgrade.vtc b/reg-tests/http-messaging/protocol_upgrade.vtc
index 753aafe2784ec9d0028934cc3cbca1953be5e604..7d122aa084fce7f84fbafd77728e09e05d5d72a6 100644 (file)
--- a/reg-tests/http-messaging/protocol_upgrade.vtc
+++ b/reg-tests/http-messaging/protocol_upgrade.vtc
@@ -51,7 +51,6 @@ server srv_h2 {
 haproxy hap -conf {
        defaults
        mode http
-       ${no-htx} option http-use-htx
        timeout connect 1s
        timeout client  1s
        timeout server  1s

diff --git a/reg-tests/http-messaging/websocket.vtc b/reg-tests/http-messaging/websocket.vtc
index 576c89d68136e44027aa7d2c12c1f71683e07478..472e5f2f7b27f0b6d1243ea0ff82b49c8076c143 100644 (file)
--- a/reg-tests/http-messaging/websocket.vtc
+++ b/reg-tests/http-messaging/websocket.vtc
@@ -47,7 +47,6 @@ server s2 {
 haproxy hap_srv -conf {
        defaults
        mode http
-       ${no-htx} option http-use-htx
        timeout connect 1s
        timeout client  1s
        timeout server  1s
@@ -70,7 +69,6 @@ haproxy hap_srv -conf {
 haproxy hap_srv_bad_key -conf {
        defaults
        mode http
-       ${no-htx} option http-use-htx
        timeout connect 1s
        timeout client  1s
        timeout server  1s
@@ -91,7 +89,6 @@ haproxy hap_srv_bad_key -conf {
 haproxy hap -conf {
        defaults
        mode http
-       ${no-htx} option http-use-htx
        timeout connect 1s
        timeout client  1s
        timeout server  1s

diff --git a/reg-tests/http-rules/acl_cli_spaces.vtc b/reg-tests/http-rules/acl_cli_spaces.vtc
index 55919ea40aa5d2f71603c208bc7408e07aced3e2..4db79a5faa269ef6523e6f9d9afa1719f7be2e49 100644 (file)
--- a/reg-tests/http-rules/acl_cli_spaces.vtc
+++ b/reg-tests/http-rules/acl_cli_spaces.vtc
@@ -12,7 +12,6 @@ server s1 {
 haproxy h1 -W -S -conf {
   defaults
     mode http
-    ${no-htx} option http-use-htx
     log global
     option httplog
     timeout connect         1s

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 3ba47aab5071780069abd669056f9c8a46eba663..6628f367a84fee05100735ad5747dedd50cae658 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
@@ -72,7 +72,6 @@ server s2 {
 haproxy h1 -conf {
   defaults
     mode http
-    ${no-htx} option http-use-htx
     log global
     option httplog
     timeout connect         1s
@@ -128,7 +127,6 @@ haproxy h1 -conf {
 haproxy h2 -conf {
   defaults
     mode http
-    ${no-htx} option http-use-htx
     log global
     option httplog
     timeout connect         1s

diff --git a/reg-tests/http-rules/h1or2_to_h1c.vtc b/reg-tests/http-rules/h1or2_to_h1c.vtc
index 3fbc3f747142aa70a2d4bb259c8c82dd7b882cb6..182013b59af3f0e9e9e3139731b847fb48695e3d 100644 (file)
--- a/reg-tests/http-rules/h1or2_to_h1c.vtc
+++ b/reg-tests/http-rules/h1or2_to_h1c.vtc
@@ -38,7 +38,6 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       ${no-htx} option http-use-htx
        timeout connect 1s
        timeout client  1s
        timeout server  1s

diff --git a/reg-tests/http-rules/map_redirect.vtc b/reg-tests/http-rules/map_redirect.vtc
index 7f4526a25bc26a57f07aace4f535bde157d3bbc5..f6a0eeb2da8ffacada85fa08a42fe85aa2b03ecb 100644 (file)
--- a/reg-tests/http-rules/map_redirect.vtc
+++ b/reg-tests/http-rules/map_redirect.vtc
@@ -35,7 +35,6 @@ server s4 {
 haproxy h1 -conf {
   defaults
     mode http
-    ${no-htx} option http-use-htx
     log global
     option httplog
     timeout connect         1s

diff --git a/reg-tests/http-rules/map_regm_with_backref.vtc b/reg-tests/http-rules/map_regm_with_backref.vtc
index 0e6e66e4c3f5d34d6f54b83115986a1c84e0969f..7a5b879d2abf15c6b427278be2cfe73064abb895 100644 (file)
--- a/reg-tests/http-rules/map_regm_with_backref.vtc
+++ b/reg-tests/http-rules/map_regm_with_backref.vtc
@@ -39,7 +39,6 @@ haproxy h1 -conf {
 
   defaults
     mode http
-    ${no-htx} option http-use-htx
     log global
     option httplog
     timeout connect         1s

diff --git a/reg-tests/lua/bad_http_clt_req_duration.vtc b/reg-tests/lua/bad_http_clt_req_duration.vtc
index 2da5e873f15c4afb90fb5481d88efe7847fc3cba..4952f61ff45afe4e3eec8d6b92bc77b469529f3d 100644 (file)
--- a/reg-tests/lua/bad_http_clt_req_duration.vtc
+++ b/reg-tests/lua/bad_http_clt_req_duration.vtc
@@ -44,7 +44,6 @@ haproxy h1 -conf {
 
     frontend f1
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${f1}"
         log ${Slog_addr}:${Slog_port} daemon
         log-format Ta=%Ta\ Tc=%Tc\ Td=%Td\ Th=%Th\ Ti=%Ti\ Tq=%Tq\ TR=%TR\ Tr=%Tr\ Tt=%Tt\ Tw=%Tw
@@ -52,7 +51,6 @@ haproxy h1 -conf {
 
     backend b1
         mode http
-        ${no-htx} option http-use-htx
         http-request use-service lua.foo.http
 
     frontend f2

diff --git a/reg-tests/lua/close_wait_lf.vtc b/reg-tests/lua/close_wait_lf.vtc
index 98492ee8e8793e5441994da24f4e5a9ec38de7a5..b6772b04d907ff00a4fef01c1b099987c6d6fe56 100644 (file)
--- a/reg-tests/lua/close_wait_lf.vtc
+++ b/reg-tests/lua/close_wait_lf.vtc
@@ -36,7 +36,6 @@ haproxy h1 -conf {
         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
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${frt}"
         http-request use-service lua.donothing
 } -start

diff --git a/reg-tests/lua/h_txn_get_priv.vtc b/reg-tests/lua/h_txn_get_priv.vtc
index 658a3d665136b08221245c640c23ccd55dae6e48..bd8c0695068865514f5b1eebd12bd6b309324384 100644 (file)
--- a/reg-tests/lua/h_txn_get_priv.vtc
+++ b/reg-tests/lua/h_txn_get_priv.vtc
@@ -9,7 +9,6 @@ haproxy h1 -conf {
 
     frontend fe1
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${fe1}"
         default_backend b1
 
@@ -17,7 +16,6 @@ haproxy h1 -conf {
 
     backend b1
         mode http
-        ${no-htx} option http-use-htx
         http-request use-service lua.fakeserv
 } -start
 

diff --git a/reg-tests/lua/lua_socket.vtc b/reg-tests/lua/lua_socket.vtc
index 25e238e522eb5e388a11f7ef9fb59cbb19c893f2..2e126f5c1e1c99b26d43990373200ec3232d09c5 100644 (file)
--- a/reg-tests/lua/lua_socket.vtc
+++ b/reg-tests/lua/lua_socket.vtc
@@ -15,13 +15,11 @@ haproxy h1 -conf {
 
     frontend fe1
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${fe1}"
         default_backend b1
 
     backend b1
         mode http
-        ${no-htx} option http-use-htx
         http-request use-service lua.fakeserv
 
 } -start

diff --git a/reg-tests/lua/set_var.vtc b/reg-tests/lua/set_var.vtc
index af4cbf1eb6eade08a4210e2ed229b990767c370e..5ca49b6bf519076b3a0c9f7f142185c38057523d 100644 (file)
--- a/reg-tests/lua/set_var.vtc
+++ b/reg-tests/lua/set_var.vtc
@@ -16,14 +16,12 @@ haproxy h1 -conf {
 
     frontend fe1
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${fe1}"
 
         http-request use-service lua.set_var
 
     frontend fe2
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${fe2}"
 
         http-request set-header Dummy %[var(txn.fe2_foo)]

diff --git a/reg-tests/lua/txn_get_priv-thread.vtc b/reg-tests/lua/txn_get_priv-thread.vtc
index 6f5d632691fecbc638ca64bab31b1df3899aa7e9..95383634293dcc9f6e661add134414b7955c133a 100644 (file)
--- a/reg-tests/lua/txn_get_priv-thread.vtc
+++ b/reg-tests/lua/txn_get_priv-thread.vtc
@@ -17,20 +17,17 @@ haproxy h1 -conf {
 
     frontend fe1
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${fe1}"
         default_backend b1
 
     frontend fe2
         mode http
-        ${no-htx} option http-use-htx
         bind ":8443" ssl crt ${testdir}/common.pem
         stats enable
         stats uri /
 
     backend b1
         mode http
-        ${no-htx} option http-use-htx
         http-request use-service lua.fakeserv
 } -start
 

diff --git a/reg-tests/lua/txn_get_priv.vtc b/reg-tests/lua/txn_get_priv.vtc
index 25fb063b2a1c1de37a454249bc7fba53852593b0..71e7bb50303b171a45af34bff3bbee6f482a6086 100644 (file)
--- a/reg-tests/lua/txn_get_priv.vtc
+++ b/reg-tests/lua/txn_get_priv.vtc
@@ -11,20 +11,17 @@ haproxy h1 -conf {
 
     frontend fe1
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${fe1}"
         default_backend b1
 
     frontend fe2
         mode http
-        ${no-htx} option http-use-htx
         bind ":8443" ssl crt ${testdir}/common.pem
         stats enable
         stats uri /
 
     backend b1
         mode http
-        ${no-htx} option http-use-htx
         http-request use-service lua.fakeserv
 } -start
 

diff --git a/reg-tests/lua/wrong_types_usage.vtc b/reg-tests/lua/wrong_types_usage.vtc
index 321ddf47b6cf01226d739a64eed7ce8792b97a9a..ed76579ba2d7e4671fe71bb14d027dfc01abe308 100644 (file)
--- a/reg-tests/lua/wrong_types_usage.vtc
+++ b/reg-tests/lua/wrong_types_usage.vtc
@@ -47,7 +47,6 @@ haproxy h1 -conf {
 
     frontend fe1
         mode http
-        ${no-htx} option http-use-htx
         bind "fd@${fe1}"
         default_backend b1
 
@@ -55,7 +54,6 @@ haproxy h1 -conf {
 
     backend b1
         mode http
-        ${no-htx} option http-use-htx
         server s1 ${s1_addr}:${s1_port}
 
 } -start

diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc
index dd6c6205fa219aa42ffd456a484aad7123a74cf4..e98121ce69e7e5538b326f09443b7d33b8d6a2d0 100644 (file)
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -13,7 +13,6 @@ haproxy h1 -W -S -conf {
         nbproc 4
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/mcli/mcli_start_progs.vtc b/reg-tests/mcli/mcli_start_progs.vtc
index bda9b96010f78cd76a5fbac36c7e09486c08ae29..ec0219aca13d6547479de5fee388c37e3b28ffcc 100644 (file)
--- a/reg-tests/mcli/mcli_start_progs.vtc
+++ b/reg-tests/mcli/mcli_start_progs.vtc
@@ -14,7 +14,6 @@ haproxy h1 -W -S -conf {
         nbproc 1
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc
index b7d6c7c487ad8ea9656136926e090459bf1dc255..5932a78d749626ec2b018799305d782e6cc81da1 100644 (file)
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -28,7 +28,6 @@ haproxy h1 -W -conf {
 
   defaults
     mode http
-    ${no-htx} option http-use-htx
     log global
     option httplog
     timeout connect         1s

diff --git a/reg-tests/server/cli_add_server.vtc b/reg-tests/server/cli_add_server.vtc
index 8bb4cd2e62fd134e32ccf1efefed444f722cc34d..670eaac1a21c48aadc51c50abee826c1e0e8baad 100644 (file)
--- a/reg-tests/server/cli_add_server.vtc
+++ b/reg-tests/server/cli_add_server.vtc
@@ -12,7 +12,6 @@ server s1 {
 haproxy h1 -conf {
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout connect 1s
                timeout client  1s
                timeout server  1s

diff --git a/reg-tests/server/cli_delete_server.vtc b/reg-tests/server/cli_delete_server.vtc
index 3b2a57b8157ac1bb92aff28a464d98a95ba77983..7b92d71462f9c74a38f5b0062491117ad0403ed8 100644 (file)
--- a/reg-tests/server/cli_delete_server.vtc
+++ b/reg-tests/server/cli_delete_server.vtc
@@ -21,7 +21,6 @@ server s2 -repeat 3 {
 haproxy h1 -conf {
        defaults
                mode http
-               ${no-htx} option http-use-htx
                timeout connect 1s
                timeout client  1s
                timeout server  1s

diff --git a/reg-tests/server/cli_set_fdqn.vtc b/reg-tests/server/cli_set_fdqn.vtc
index b3b00c3e49ba79447a6d600e3d1f23a40563470d..8c1513391fc57c66f1cb689003724aaa7a2a4ff8 100644 (file)
--- a/reg-tests/server/cli_set_fdqn.vtc
+++ b/reg-tests/server/cli_set_fdqn.vtc
@@ -13,7 +13,6 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/server/cli_set_ssl.vtc b/reg-tests/server/cli_set_ssl.vtc
index 638debea0d2e90126feb758de85a1530f954bf76..387c2990117a1731ebcd97df068b77c0ff622bf1 100644 (file)
--- a/reg-tests/server/cli_set_ssl.vtc
+++ b/reg-tests/server/cli_set_ssl.vtc
@@ -17,7 +17,6 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout connect 1s
         timeout client  1s
         timeout server  1s

diff --git a/reg-tests/ssl/add_ssl_crt-list.vtc b/reg-tests/ssl/add_ssl_crt-list.vtc
index f42e3af538b5264f418c831b5f1c6ef379397fc9..ca52285011c27a39a259abd0b9627e0650ac442e 100644 (file)
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@@ -31,7 +31,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 1s
@@ -48,7 +47,6 @@ haproxy h1 -conf {
 
     listen ssl-lst
         mode http
-        ${no-htx} option http-use-htx
         bind "${tmpdir}/ssl.sock" ssl strict-sni crt-list ${testdir}/localhost.crt-list
 
         server s1 ${s1_addr}:${s1_port}

diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc b/reg-tests/ssl/del_ssl_crt-list.vtc
index c61adc28d61cd1a179d4840d2a246e2a1375e1fd..4bf89f9cc08436ca21de4e2d77049e2fc5bd0cd0 100644 (file)
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@@ -29,7 +29,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms
@@ -47,13 +46,11 @@ haproxy h1 -conf {
 
     listen first-ssl-fe
         mode http
-        ${no-htx} option http-use-htx
         bind "${tmpdir}/first-ssl.sock" ssl strict-sni crt-list ${testdir}/simple.crt-list
         server s1 ${s1_addr}:${s1_port}
 
     listen second-ssl-fe
         mode http
-        ${no-htx} option http-use-htx
         bind "${tmpdir}/second-ssl.sock" ssl crt-list ${testdir}/localhost.crt-list
         server s1 ${s1_addr}:${s1_port}
 } -start

diff --git a/reg-tests/ssl/new_del_ssl_cafile.vtc b/reg-tests/ssl/new_del_ssl_cafile.vtc
index 6230a9d084d5697fe82e7bf456d63dd80c5adaaf..613e128665286410d8ee7c6b24ff70b964e62b9e 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_cafile.vtc
+++ b/reg-tests/ssl/new_del_ssl_cafile.vtc
@@ -29,7 +29,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/new_del_ssl_crlfile.vtc b/reg-tests/ssl/new_del_ssl_crlfile.vtc
index 8f82c66fdaa5e0e02c84633944a75714bb223fee..0d82200e7f7c29fa21d0fa1a129387f9739b2dc9 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_crlfile.vtc
+++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc
@@ -29,7 +29,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc
index 04f892c68419d2b338d420e859936015d8705f21..eb625639bf50a96693254adc047bd414b16ba750 100644 (file)
--- a/reg-tests/ssl/set_ssl_cafile.vtc
+++ b/reg-tests/ssl/set_ssl_cafile.vtc
@@ -34,7 +34,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index a606b477d9761d28953f655a00eb022f57c5d1d2..c4d0883064805b1772f0184b7c55178be467e36d 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@@ -40,7 +40,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_cert_bundle.vtc b/reg-tests/ssl/set_ssl_cert_bundle.vtc
index bbc34a40088d90dc3183b80e388677aa7499d73f..aaec89ddae710ad62ad8317e9a5e538dd0d7bc84 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_bundle.vtc
+++ b/reg-tests/ssl/set_ssl_cert_bundle.vtc
@@ -35,7 +35,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc b/reg-tests/ssl/set_ssl_cert_noext.vtc
index 80736bb4cc2e0ed991f6aac390a05df8a5ee6df1..f1c42ff84c779dd540211b69b8e704a2587efc35 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@@ -32,7 +32,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc b/reg-tests/ssl/set_ssl_crlfile.vtc
index a1889d0e42a7b9d79dee624640874613954478a4..7060a1477c02ed1b0f0fbbaf786e4b83b62d78df 100644 (file)
--- a/reg-tests/ssl/set_ssl_crlfile.vtc
+++ b/reg-tests/ssl/set_ssl_crlfile.vtc
@@ -37,7 +37,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_server_cert.vtc b/reg-tests/ssl/set_ssl_server_cert.vtc
index ccf78873b3f7bcf48e3ccafe6d6334beeb39d2f9..0dbef7228db491fc08d9345125b3fca2eb94e986 100644 (file)
--- a/reg-tests/ssl/set_ssl_server_cert.vtc
+++ b/reg-tests/ssl/set_ssl_server_cert.vtc
@@ -24,7 +24,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/ssl_client_auth.vtc b/reg-tests/ssl/ssl_client_auth.vtc
index 849e8781ef77f8992c950fc2bd32add94ff5a686..f82be7b1652d91e38925d608a6109526bade1e22 100644 (file)
--- a/reg-tests/ssl/ssl_client_auth.vtc
+++ b/reg-tests/ssl/ssl_client_auth.vtc
@@ -31,7 +31,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 1s

diff --git a/reg-tests/ssl/ssl_client_samples.vtc b/reg-tests/ssl/ssl_client_samples.vtc
index ccefa7940d8b47a4060aaeb65dbedc11efacdc58..83662be6dfd8623e192382ba1ba54f777b2fd49d 100644 (file)
--- a/reg-tests/ssl/ssl_client_samples.vtc
+++ b/reg-tests/ssl/ssl_client_samples.vtc
@@ -19,7 +19,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 1s
@@ -34,7 +33,6 @@ haproxy h1 -conf {
 
     listen ssl-lst
         mode http
-        ${no-htx} option http-use-htx
 
         http-response add-header x-ssl-der %[ssl_c_der,hex]
         http-response add-header x-ssl-chain-der %[ssl_c_chain_der,hex]

diff --git a/reg-tests/ssl/ssl_crt-list_filters.vtc b/reg-tests/ssl/ssl_crt-list_filters.vtc
index a5ba189c98560b5a64cd2c4e4becc7ba4d8c6810..90b945238e787ca8323e15d1c0a27f41db6c41cb 100644 (file)
--- a/reg-tests/ssl/ssl_crt-list_filters.vtc
+++ b/reg-tests/ssl/ssl_crt-list_filters.vtc
@@ -38,7 +38,6 @@ haproxy h1 -conf {
 
     listen ssl-lst
         mode http
-        ${no-htx} option http-use-htx
         bind "${tmpdir}/ssl.sock" ssl strict-sni ssl-min-ver TLSv1.2 ssl-max-ver TLSv1.2 ciphers "kRSA:aECDSA" crt-list ${testdir}/filters.crt-list
 
         server s1 ${s1_addr}:${s1_port}

diff --git a/reg-tests/ssl/ssl_frontend_samples.vtc b/reg-tests/ssl/ssl_frontend_samples.vtc
index 5a7a0ee9b144e917c0367970a57316a11fab202b..86851cf7567d06eeb0c39f023b8cf49e85553168 100644 (file)
--- a/reg-tests/ssl/ssl_frontend_samples.vtc
+++ b/reg-tests/ssl/ssl_frontend_samples.vtc
@@ -19,7 +19,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 1s
@@ -34,7 +33,6 @@ haproxy h1 -conf {
 
     listen ssl-lst
         mode http
-        ${no-htx} option http-use-htx
 
         http-response add-header x-ssl-der %[ssl_f_der,hex]
         http-response add-header x-ssl-sha1 %[ssl_f_sha1,hex]

diff --git a/reg-tests/ssl/ssl_server_samples.vtc b/reg-tests/ssl/ssl_server_samples.vtc
index 53dd1b81c6ed7efdd3a807b62e5414ebbed35bb1..136ccafa490c834e054b17e7288af0bc20d8ddd4 100644 (file)
--- a/reg-tests/ssl/ssl_server_samples.vtc
+++ b/reg-tests/ssl/ssl_server_samples.vtc
@@ -20,7 +20,6 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        ${no-htx} option http-use-htx
         log stderr local0 debug err
         option logasap
         timeout connect 1s
@@ -47,7 +46,6 @@ haproxy h1 -conf {
 
     listen ssl-lst
         mode http
-        ${no-htx} option http-use-htx
 
         bind "${tmpdir}/ssl.sock" ssl strict-sni crt-list ${testdir}/localhost.crt-list
 

diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc b/reg-tests/ssl/ssl_simple_crt-list.vtc
index d3353a1295f1b718a92325667448dfdfe7387526..d35c27d676e016fef2e980ccd33ba2b1772aa296 100644 (file)
--- a/reg-tests/ssl/ssl_simple_crt-list.vtc
+++ b/reg-tests/ssl/ssl_simple_crt-list.vtc
@@ -37,7 +37,6 @@ haproxy h1 -conf {
 
     listen ssl-lst
         mode http
-        ${no-htx} option http-use-htx
         bind "${tmpdir}/ssl.sock" ssl strict-sni crt-list ${testdir}/simple.crt-list
 
         server s1 ${s1_addr}:${s1_port}

diff --git a/reg-tests/ssl/wrong_ctx_storage.vtc b/reg-tests/ssl/wrong_ctx_storage.vtc
index 9f0bdd78941547317ec9a74a6a2e78814ff1109b..7dc7528a567bd8539d9114c4dd007eb132f20092 100644 (file)
--- a/reg-tests/ssl/wrong_ctx_storage.vtc
+++ b/reg-tests/ssl/wrong_ctx_storage.vtc
@@ -29,7 +29,6 @@ haproxy h1 -conf {
 
   listen frt
     mode http
-    ${no-htx} option http-use-htx
     bind "fd@${frt}" ssl crt ${testdir}/common.pem
     http-request redirect location /
 } -start

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 502a05996a8c0828d77a88a2bf93b52808338091..2e859bdb530829b36803e5acc1c6597c00129dad 100644 (file)
--- a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
+++ b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
@@ -30,7 +30,6 @@ haproxy h1 -conf {
     # Configuration file of 'h1' haproxy instance.
     defaults
         mode   http
-        ${no-htx} option http-use-htx
         timeout connect         5s
         timeout server          30s
         timeout client          30s

diff --git a/reg-tests/stick-table/src_conn_rate.vtc b/reg-tests/stick-table/src_conn_rate.vtc
index 7078213ad4a8eef68f92f637de4fb85861a652f6..8281ca935e5eed8f087bb73f0191c534143d6893 100644 (file)
--- a/reg-tests/stick-table/src_conn_rate.vtc
+++ b/reg-tests/stick-table/src_conn_rate.vtc
@@ -9,7 +9,6 @@ haproxy h0 -conf {
                timeout server 5s
 
                listen li
-                       ${no-htx} option http-use-htx
                        bind "fd@${fe1}"
                        http-request track-sc0 src table conn_rate_table
                        http-request deny if { src_conn_rate(conn_rate_table) gt 3 }

diff --git a/reg-tests/stick-table/unknown_key.vtc b/reg-tests/stick-table/unknown_key.vtc
index ca84c0bef963c4457e3655fdb8ade2532e09bee1..980443c01e71f27b426859851de89fa76309506f 100644 (file)
--- a/reg-tests/stick-table/unknown_key.vtc
+++ b/reg-tests/stick-table/unknown_key.vtc
@@ -18,7 +18,6 @@ haproxy h0 -conf {
 
        frontend test
                mode http
-               ${no-htx} option http-use-htx
                bind "fd@${fe1}"
                stick-table type ip size 1m expire 1h store gpc0
                http-request deny if { src,table_trackers(test) eq 1 }

diff --git a/reg-tests/stickiness/lb-services.vtc b/reg-tests/stickiness/lb-services.vtc
index e8865646806082d9869cb9482eeba5b03134c0c5..28b08b534077582c423ba335a9cc9198070bfbe3 100644 (file)
--- a/reg-tests/stickiness/lb-services.vtc
+++ b/reg-tests/stickiness/lb-services.vtc
@@ -46,7 +46,6 @@ server s4 {
 haproxy h1 -arg "-L A" -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout server 1s
         timeout connect 1s
         timeout client 1s
@@ -110,7 +109,6 @@ server s8 {
 haproxy h2 -arg "-L B" -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout server 1s
         timeout connect 1s
         timeout client 1s

diff --git a/reg-tests/stickiness/srvkey-addr.vtc b/reg-tests/stickiness/srvkey-addr.vtc
index 05616387a55cc566716f4fe97fa8a3efee19806e..5001063b7af95ece1bb359e7f4323345b716656b 100644 (file)
--- a/reg-tests/stickiness/srvkey-addr.vtc
+++ b/reg-tests/stickiness/srvkey-addr.vtc
@@ -35,7 +35,6 @@ server s2 {
 haproxy h1 -arg "-L A" -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout server 1s
         timeout connect 1s
         timeout client 1s
@@ -77,7 +76,6 @@ haproxy h1 -arg "-L A" -conf {
 haproxy h2 -arg "-L B" -conf {
     defaults
         mode http
-        ${no-htx} option http-use-htx
         timeout server 1s
         timeout connect 1s
         timeout client 1s

diff --git a/reg-tests/webstats/webstats-scope-and-post-change.vtc b/reg-tests/webstats/webstats-scope-and-post-change.vtc
index fe8b33333d5751da957832aa811d98eff993f678..b26356fefe2bf217ce155080b3d4452f61e23388 100644 (file)
--- a/reg-tests/webstats/webstats-scope-and-post-change.vtc
+++ b/reg-tests/webstats/webstats-scope-and-post-change.vtc
@@ -17,7 +17,6 @@ haproxy h1 -conf {
 
   defaults
     mode http
-    ${no-htx} option http-use-htx
 
   frontend fe1
     bind "fd@${fe1}"

diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index 37668c9e1a45341d012f60943bcf1b3e70c9d22b..b542f24f834f3cf36581c388e768676d13edb6ad 100755 (executable)
--- a/scripts/run-regtests.sh
+++ b/scripts/run-regtests.sh
@@ -38,15 +38,6 @@ _help()
     --clean to cleanup previous reg-tests log directories and exit
       run-regtests.sh --clean
 
-    --use-htx to use the HTX in tests (deprecated, the default mode now)
-
-    --no-htx to use the legacy HTTP in tests
-      run-regtests.sh --no-htx, sets the macro \${no-htx}
-      In .vtc files, in HAProxy configuration, you should use the following line
-      to "templatize" your tests:
-
-          \${no-htx} option http-use-htx
-
   Including text below into a .vtc file will check for its requirements
   related to haproxy's target and compilation options
     # Below targets are not capable of completing this test successfully
@@ -283,12 +274,6 @@ _process() {
              REGTESTS_TYPES="$2"
              shift
              ;;
-        --use-htx)
-          no_htx=""
-          ;;
-        --no-htx)
-          no_htx="no "
-          ;;
         --clean)
           _cleanup
           exit 0
@@ -323,7 +308,6 @@ jobcount=""
 verbose="-q"
 debug=""
 keep_logs="-l"
-no_htx=""
 testlist=""
 
 _process "$@";
@@ -367,10 +351,6 @@ echo "Options : $FEATURES"
 echo "Services : $SERVICES"
 
 echo "########################## Gathering tests to run ##########################"
-# if htx is enable, but HAProxy version is lower to 1.9, disable it
-if [ $(_version "$HAPROXY_VERSION") -lt $(_version "1.9") ]; then
-  no_htx="#"
-fi
 
 if [ -z "$REGTESTS" ]; then
   _findtests reg-tests/
@@ -387,7 +367,7 @@ if [ -n "$testlist" ]; then
   if [ -n "$jobcount" ]; then
     jobcount="-j $jobcount"
   fi
-  cmd="$VTEST_PROGRAM -b $((2<<20)) -k -t 10 -Dno-htx=${no_htx} $keep_logs $verbose $debug $jobcount $vtestparams $testlist"
+  cmd="$VTEST_PROGRAM -b $((2<<20)) -k -t 10 $keep_logs $verbose $debug $jobcount $vtestparams $testlist"
   eval $cmd
   _vtresult=$?
 else