mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-20 21:31:28 +02:00
Code Issues Projects Releases Wiki Activity

REGTESTS: Replace REQUIRE_VERSION=2.5 with 'haproxy -cc'

Browse Source 
This is safe, because running `haproxy -cc 'version_atleast(2.5-dev0)'` on
HAProxy 2.4 will also result in an exit code of 1.
This commit is contained in:
Tim Duesterhus 2021-06-11 19:56:15 +02:00 committed by Willy Tarreau
parent 8a91fa4219
commit 5efc48dcf1
7 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ feature ignore_unknown_macro
# NOTE : This test may fail if too many vtest are running in parallel because # NOTE : This test may fail if too many vtest are running in parallel because
# the port reserved for closed s1 server may be reused by another vtest # the port reserved for closed s1 server may be reused by another vtest
#REQUIRE_VERSION=2.5 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
#REGTEST_TYPE=slow #REGTEST_TYPE=slow
# b1 : Don't send /c4 before /c3 was received by s2 server # b1 : Don't send /c4 before /c3 was received by s2 server

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

@ -9,7 +9,7 @@
# - Check that you have socat # - Check that you have socat
varnishtest "Test the 'new ssl ca-file' and 'del ssl ca-file' commands of the CLI" varnishtest "Test the 'new ssl ca-file' and 'del ssl ca-file' commands of the CLI"
#REQUIRE_VERSION=2.5 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
#REQUIRE_OPTIONS=OPENSSL #REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat #REQUIRE_BINARIES=socat
feature ignore_unknown_macro feature ignore_unknown_macro

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

@ -9,7 +9,7 @@
# - Check that you have socat # - Check that you have socat
varnishtest "Test the 'new ssl crl-file' and 'del ssl crl-file' commands of the CLI" varnishtest "Test the 'new ssl crl-file' and 'del ssl crl-file' commands of the CLI"
#REQUIRE_VERSION=2.5 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
#REQUIRE_OPTIONS=OPENSSL #REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat #REQUIRE_BINARIES=socat
feature ignore_unknown_macro feature ignore_unknown_macro

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

@ -15,7 +15,7 @@
# - Check that you have socat # - Check that you have socat
varnishtest "Test the 'set ssl ca-file' feature of the CLI" varnishtest "Test the 'set ssl ca-file' feature of the CLI"
#REQUIRE_VERSION=2.5 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
#REQUIRE_OPTIONS=OPENSSL #REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat #REQUIRE_BINARIES=socat
feature ignore_unknown_macro feature ignore_unknown_macro

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

@ -18,7 +18,7 @@
# - Check that you have socat # - Check that you have socat
varnishtest "Test the 'set ssl crl-file' feature of the CLI" varnishtest "Test the 'set ssl crl-file' feature of the CLI"
#REQUIRE_VERSION=2.5 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
#REQUIRE_OPTIONS=OPENSSL #REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat #REQUIRE_BINARIES=socat
feature ignore_unknown_macro feature ignore_unknown_macro

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

@ -19,7 +19,7 @@
# - Check that you have socat # - Check that you have socat
varnishtest "Test the 'show ssl ocsp-response' and 'show ssl cert foo.pem.ocsp' features of the CLI" varnishtest "Test the 'show ssl ocsp-response' and 'show ssl cert foo.pem.ocsp' features of the CLI"
#REQUIRE_VERSION=2.5 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
#REQUIRE_OPTIONS=OPENSSL #REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat #REQUIRE_BINARIES=socat
feature ignore_unknown_macro feature ignore_unknown_macro

1
reg-tests/startup/check_condition.vtc
View File

@ -1,6 +1,5 @@
varnishtest "Tests the -cc argument" varnishtest "Tests the -cc argument"
#REQUIRE_VERSION=2.5
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
shell { shell {