Re: [PATCH 1/3] REGTESTS: Remove REQUIRE_VERSION=1.9 from all tests

2023-01-05 Thread Willy Tarreau
Hi Tim,

On Wed, Jan 04, 2023 at 06:49:36PM +0100, Tim Duesterhus wrote:
> HAProxy 2.0 is the lowest supported version, thus this always matches.
(...)

Series merged, thank you!
Willy



[PATCH 1/3] REGTESTS: Remove REQUIRE_VERSION=1.9 from all tests

2023-01-04 Thread Tim Duesterhus
HAProxy 2.0 is the lowest supported version, thus this always matches.

see 1b095cac9468d0c3eeb157e9b1a2947487bd3c83
---
 reg-tests/cache/basic.vtc  | 2 --
 reg-tests/cache/sample_fetches.vtc | 2 --
 reg-tests/compression/basic.vtc| 1 -
 reg-tests/compression/etags_conversion.vtc | 1 -
 reg-tests/compression/vary.vtc | 1 -
 reg-tests/http-messaging/h2_to_h1.vtc  | 1 -
 .../http-rules/converters_ipmask_concat_strcmp_field_word.vtc  | 3 ---
 reg-tests/http-rules/h1or2_to_h1c.vtc  | 1 -
 reg-tests/mcli/mcli_show_info.vtc  | 2 --
 9 files changed, 14 deletions(-)

diff --git a/reg-tests/cache/basic.vtc b/reg-tests/cache/basic.vtc
index d6a8c00b3b..377cbb3792 100644
--- a/reg-tests/cache/basic.vtc
+++ b/reg-tests/cache/basic.vtc
@@ -1,7 +1,5 @@
 varnishtest "Basic cache test"
 
-#REQUIRE_VERSION=1.9
-
 feature ignore_unknown_macro
 
 server s1 {
diff --git a/reg-tests/cache/sample_fetches.vtc 
b/reg-tests/cache/sample_fetches.vtc
index c2b1d15be0..c2b99c20ca 100644
--- a/reg-tests/cache/sample_fetches.vtc
+++ b/reg-tests/cache/sample_fetches.vtc
@@ -1,8 +1,6 @@
 
 varnishtest "Basic cache test"
 
-#REQUIRE_VERSION=1.9
-
 feature ignore_unknown_macro
 
 server s1 {
diff --git a/reg-tests/compression/basic.vtc b/reg-tests/compression/basic.vtc
index 76ad43dc37..5d9eadabde 100644
--- a/reg-tests/compression/basic.vtc
+++ b/reg-tests/compression/basic.vtc
@@ -1,6 +1,5 @@
 varnishtest "Basic compression test"
 
-#REQUIRE_VERSION=1.9
 #REQUIRE_OPTION=ZLIB|SLZ
 
 feature ignore_unknown_macro
diff --git a/reg-tests/compression/etags_conversion.vtc 
b/reg-tests/compression/etags_conversion.vtc
index c5684a20ff..96e34bcf9c 100644
--- a/reg-tests/compression/etags_conversion.vtc
+++ b/reg-tests/compression/etags_conversion.vtc
@@ -1,6 +1,5 @@
 varnishtest "Compression converts strong ETags to weak ETags"
 
-#REQUIRE_VERSION=1.9
 #REQUIRE_OPTION=ZLIB|SLZ
 
 feature ignore_unknown_macro
diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc
index 8219c734e6..34d8976c09 100644
--- a/reg-tests/compression/vary.vtc
+++ b/reg-tests/compression/vary.vtc
@@ -1,6 +1,5 @@
 varnishtest "Compression sets Vary header"
 
-#REQUIRE_VERSION=1.9
 #REQUIRE_OPTION=ZLIB|SLZ
 
 feature ignore_unknown_macro
diff --git a/reg-tests/http-messaging/h2_to_h1.vtc 
b/reg-tests/http-messaging/h2_to_h1.vtc
index 852ee4caf9..91d1056d86 100644
--- a/reg-tests/http-messaging/h2_to_h1.vtc
+++ b/reg-tests/http-messaging/h2_to_h1.vtc
@@ -1,5 +1,4 @@
 varnishtest "HTTP request tests: H2 to H1 (HTX and legacy mode)"
-#REQUIRE_VERSION=1.9
 
 # Run it with HAPROXY_PROGRAM=$PWD/haproxy varnishtest -l -k -t 1 "$1"
 
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 e567e38780..00d74ce287 100644
--- a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
+++ b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
@@ -1,9 +1,6 @@
 varnishtest "Minimal tests for 1.9 converters: ipmask,concat,strcmp,field,word"
 feature ignore_unknown_macro
 
-# concat,strcmp,ipmask(ipv6mask) need 1.9
-#REQUIRE_VERSION=1.9
-
 # ipmask tests server
 server s1 {
rxreq
diff --git a/reg-tests/http-rules/h1or2_to_h1c.vtc 
b/reg-tests/http-rules/h1or2_to_h1c.vtc
index 9e7eb604a3..3423d162a1 100644
--- a/reg-tests/http-rules/h1or2_to_h1c.vtc
+++ b/reg-tests/http-rules/h1or2_to_h1c.vtc
@@ -1,5 +1,4 @@
 varnishtest "Composite HTTP manipulation test (H1 and H2 clear to H1 clear)"
-#REQUIRE_VERSION=1.9
 
 # This config tests several http-request features and their interactions.
 # It extracts some samples, places them into variables, modifies some header
diff --git a/reg-tests/mcli/mcli_show_info.vtc 
b/reg-tests/mcli/mcli_show_info.vtc
index ae533da3a8..3c44461a77 100644
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -1,7 +1,5 @@
 varnishtest "Show info of process 1"
 
-#REQUIRE_VERSION=1.9
-
 feature ignore_unknown_macro
 
 # Do nothing. Is there only to create s1_* macros
-- 
2.39.0