RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

The legacy HTTP subsystem has been removed. HTX is always enabled.
This commit is contained in:
Tim Duesterhus 2021-05-31 23:07:29 +02:00 committed by Willy Tarreau
parent 63b3ae7ca3
commit a9334df5a9
71 changed files with 2 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reg-tests/README
View File

@ -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

1
reg-tests/cache/basic.vtc vendored
View File

@ -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

1
reg-tests/cache/caching_rules.vtc vendored
View File

@ -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

1
reg-tests/cache/expires.vtc vendored
View File

@ -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

1
reg-tests/cache/if-modified-since.vtc vendored
View File

@ -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

1
reg-tests/cache/if-none-match.vtc vendored
View File

@ -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

1
reg-tests/cache/post_on_entry.vtc vendored
View File

@ -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

1
reg-tests/cache/sample_fetches.vtc vendored
View File

@ -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

1
reg-tests/cache/vary.vtc vendored
View File

@ -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

1
reg-tests/cache/vary_accept_encoding.vtc vendored
View File

@ -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

1
reg-tests/compression/basic.vtc
View File

@ -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

1
reg-tests/compression/etags_conversion.vtc
View File

@ -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

1
reg-tests/compression/lua_validation.vtc
View File

@ -15,7 +15,6 @@ global
defaults
mode http
log global
${no-htx} option http-use-htx
option httplog
frontend main-https

1
reg-tests/compression/vary.vtc
View File

@ -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

1
reg-tests/connection/dispatch.vtc
View File

@ -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

1
reg-tests/connection/proxy_protocol_random_fail.vtc
View File

@ -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

1
reg-tests/filters/random-forwarding.vtc
View File

@ -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

1
reg-tests/http-capture/multiple_headers.vtc
View File

@ -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

1
reg-tests/http-cookies/cookie_insert_indirect.vtc
View File

@ -27,7 +27,6 @@ haproxy h1 -conf {
defaults
mode http
${no-htx} option http-use-htx
option httplog
timeout client 1s
timeout server 1s

1
reg-tests/http-messaging/h1_to_h1.vtc
View File

@ -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

1
reg-tests/http-messaging/h2_to_h1.vtc
View File

@ -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

1
reg-tests/http-messaging/http_abortonclose.vtc
View File

@ -54,7 +54,6 @@ haproxy h1 -conf {
defaults
mode http
${no-htx} option http-use-htx
option abortonclose
retries 3
timeout client 10s

1
reg-tests/http-messaging/http_bodyless_response.vtc
View File

@ -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

1
reg-tests/http-messaging/http_request_buffer.vtc
View File

@ -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

1
reg-tests/http-messaging/http_wait_for_body.vtc
View File

@ -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

1
reg-tests/http-messaging/protocol_upgrade.vtc
View File

@ -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

3
reg-tests/http-messaging/websocket.vtc
View File

@ -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

1
reg-tests/http-rules/acl_cli_spaces.vtc
View File

@ -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

2
reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
View File

@ -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

1
reg-tests/http-rules/h1or2_to_h1c.vtc
View File

@ -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

1
reg-tests/http-rules/map_redirect.vtc
View File

@ -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

1
reg-tests/http-rules/map_regm_with_backref.vtc
View File

@ -39,7 +39,6 @@ haproxy h1 -conf {
defaults
mode http
${no-htx} option http-use-htx
log global
option httplog
timeout connect 1s

2
reg-tests/lua/bad_http_clt_req_duration.vtc
View File

@ -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

1
reg-tests/lua/close_wait_lf.vtc
View File

@ -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

2
reg-tests/lua/h_txn_get_priv.vtc
View File

@ -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

2
reg-tests/lua/lua_socket.vtc
View File

@ -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

2
reg-tests/lua/set_var.vtc
View File

@ -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)]

3
reg-tests/lua/txn_get_priv-thread.vtc
View File

@ -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

3
reg-tests/lua/txn_get_priv.vtc
View File

@ -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

2
reg-tests/lua/wrong_types_usage.vtc
View File

@ -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

1
reg-tests/mcli/mcli_show_info.vtc
View File

@ -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

1
reg-tests/mcli/mcli_start_progs.vtc
View File

@ -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

1
reg-tests/seamless-reload/abns_socket.vtc
View File

@ -28,7 +28,6 @@ haproxy h1 -W -conf {
defaults
mode http
${no-htx} option http-use-htx
log global
option httplog
timeout connect 1s

1
reg-tests/server/cli_add_server.vtc
View File

@ -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

1
reg-tests/server/cli_delete_server.vtc
View File

@ -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

1
reg-tests/server/cli_set_fdqn.vtc
View File

@ -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

1
reg-tests/server/cli_set_ssl.vtc
View File

@ -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

2
reg-tests/ssl/add_ssl_crt-list.vtc
View File

@ -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}

3
reg-tests/ssl/del_ssl_crt-list.vtc
View File

@ -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

1
reg-tests/ssl/new_del_ssl_cafile.vtc
View File

@ -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

1
reg-tests/ssl/new_del_ssl_crlfile.vtc
View File

@ -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

1
reg-tests/ssl/set_ssl_cafile.vtc
View File

@ -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

1
reg-tests/ssl/set_ssl_cert.vtc
View File

@ -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

1
reg-tests/ssl/set_ssl_cert_bundle.vtc
View File

@ -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

1
reg-tests/ssl/set_ssl_cert_noext.vtc
View File

@ -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

1
reg-tests/ssl/set_ssl_crlfile.vtc
View File

@ -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

1
reg-tests/ssl/set_ssl_server_cert.vtc
View File

@ -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

1
reg-tests/ssl/ssl_client_auth.vtc
View File

@ -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

2
reg-tests/ssl/ssl_client_samples.vtc
View File

@ -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]

1
reg-tests/ssl/ssl_crt-list_filters.vtc
View File

@ -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}

2
reg-tests/ssl/ssl_frontend_samples.vtc
View File

@ -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]

2
reg-tests/ssl/ssl_server_samples.vtc
View File

@ -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

1
reg-tests/ssl/ssl_simple_crt-list.vtc
View File

@ -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}

1
reg-tests/ssl/wrong_ctx_storage.vtc
View File

@ -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

1
reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
View File

@ -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

1
reg-tests/stick-table/src_conn_rate.vtc
View File

@ -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 }

1
reg-tests/stick-table/unknown_key.vtc
View File

@ -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 }

2
reg-tests/stickiness/lb-services.vtc
View File

@ -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

2
reg-tests/stickiness/srvkey-addr.vtc
View File

@ -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

1
reg-tests/webstats/webstats-scope-and-post-change.vtc
View File

@ -17,7 +17,6 @@ haproxy h1 -conf {
defaults
mode http
${no-htx} option http-use-htx
frontend fe1
bind "fd@${fe1}"

22
scripts/run-regtests.sh
View File

@ -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