Re: [PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+ (3)

2023-08-15 Thread Willy Tarreau
On Mon, Aug 14, 2023 at 03:25:40PM +0200, Willy Tarreau wrote:
> > I don't think this is applied yet, so Cc-ing Willy.
> 
> I'll take it once I'm done with the other backports.

Now applied, thank you!
Willy



Re: [PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+ (3)

2023-08-14 Thread Willy Tarreau
Hi Tim,

On Mon, Aug 14, 2023 at 02:07:04PM +0200, Tim Düsterhus wrote:
> Hi
> 
> On 8/7/23 16:34, Aurelien DARRAGON wrote:
> > Oops indeed, wasn't aware of it, thank you Tim!
> > 
> 
> I don't think this is applied yet, so Cc-ing Willy.

I'll take it once I'm done with the other backports.

Thank you for the reminder!
Willy



Re: [PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+ (3)

2023-08-14 Thread Tim Düsterhus

Hi

On 8/7/23 16:34, Aurelien DARRAGON wrote:

Oops indeed, wasn't aware of it, thank you Tim!



I don't think this is applied yet, so Cc-ing Willy.

Best regards
Tim Düsterhus



Re: [PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+ (3)

2023-08-07 Thread Aurelien DARRAGON



On 07/08/2023 15:46, Tim Duesterhus wrote:
> Introduced in:
> 
> 424981cde REGTEST: add ifnone-forwardfor test
> b015b3eb1 REGTEST: add RFC7239 forwarded header tests
> 
> see also:
> 
> fbbbc33df REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+
> ---
>  reg-tests/http-rules/forwarded-header-7239.vtc | 2 +-
>  reg-tests/http-rules/ifnone-forwardfor.vtc | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 

Oops indeed, wasn't aware of it, thank you Tim!



[PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+ (3)

2023-08-07 Thread Tim Duesterhus
Introduced in:

424981cde REGTEST: add ifnone-forwardfor test
b015b3eb1 REGTEST: add RFC7239 forwarded header tests

see also:

fbbbc33df REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+
---
 reg-tests/http-rules/forwarded-header-7239.vtc | 2 +-
 reg-tests/http-rules/ifnone-forwardfor.vtc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reg-tests/http-rules/forwarded-header-7239.vtc 
b/reg-tests/http-rules/forwarded-header-7239.vtc
index 57c9faa2b..a894113e7 100644
--- a/reg-tests/http-rules/forwarded-header-7239.vtc
+++ b/reg-tests/http-rules/forwarded-header-7239.vtc
@@ -1,5 +1,5 @@
 varnishtest "Test RFC 7239 forwarded header support (forwarded option and 
related converters)"
-#REQUIRE_VERSION=2.8
+feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.8-dev0)'"
 
 # This config tests the HTTP forwarded option and RFC7239 related converters.
 
diff --git a/reg-tests/http-rules/ifnone-forwardfor.vtc 
b/reg-tests/http-rules/ifnone-forwardfor.vtc
index 4be82ac2f..a743b10b4 100644
--- a/reg-tests/http-rules/ifnone-forwardfor.vtc
+++ b/reg-tests/http-rules/ifnone-forwardfor.vtc
@@ -1,5 +1,5 @@
 varnishtest "Test if-none param for the forwardfor option"
-#REQUIRE_VERSION=2.6
+feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.6-dev0)'"
 
 # This config tests the if-none parameter for the HTTP forwardfor option.
 
-- 
2.41.0




Re: [PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+ (2)

2022-05-27 Thread Willy Tarreau
On Mon, May 23, 2022 at 10:45:36PM +0200, Tim Duesterhus wrote:
> Introduced in:
> 
> 18c13d3bd MEDIUM: http-ana: Add a proxy option to restrict chars in request 
> header names
(...)

Merged, thanks Tim!
Willy



[PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+ (2)

2022-05-23 Thread Tim Duesterhus
Introduced in:

18c13d3bd MEDIUM: http-ana: Add a proxy option to restrict chars in request 
header names

see also:

fbbbc33df REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+
---
 reg-tests/http-rules/restrict_req_hdr_names.vtc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reg-tests/http-rules/restrict_req_hdr_names.vtc 
b/reg-tests/http-rules/restrict_req_hdr_names.vtc
index 28a10d3db..a3a95939f 100644
--- a/reg-tests/http-rules/restrict_req_hdr_names.vtc
+++ b/reg-tests/http-rules/restrict_req_hdr_names.vtc
@@ -1,5 +1,5 @@
 varnishtest "http-restrict-req-hdr-names option tests"
-#REQUIRE_VERSION=2.6
+feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.6-dev0)'"
 
 # This config tests "http-restrict-req-hdr-names" option
 
-- 
2.36.1




Re: [PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+

2022-03-21 Thread Willy Tarreau
On Mon, Mar 21, 2022 at 09:25:28AM +0100, Tim Düsterhus wrote:
> Willy,
> 
> On 3/11/22 22:46, Tim Duesterhus wrote:
> > Introduced in:
> > 
> > 0657b9338 MINOR: stream: add "last_rule_file" and "last_rule_line" samples
> 
> I believe you missed this one.

Indeed, for an unknown reason it was marked read on my side, now merged,
thanks!

Willy



Re: [PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+

2022-03-21 Thread Tim Düsterhus

Willy,

On 3/11/22 22:46, Tim Duesterhus wrote:

Introduced in:

0657b9338 MINOR: stream: add "last_rule_file" and "last_rule_line" samples


I believe you missed this one.

Best regards
Tim Düsterhus



[PATCH] REGTESTS: Do not use REQUIRE_VERSION for HAProxy 2.5+

2022-03-11 Thread Tim Duesterhus
Introduced in:

0657b9338 MINOR: stream: add "last_rule_file" and "last_rule_line" samples
---
 reg-tests/log/last_rule.vtc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reg-tests/log/last_rule.vtc b/reg-tests/log/last_rule.vtc
index b57251912..e69516654 100644
--- a/reg-tests/log/last_rule.vtc
+++ b/reg-tests/log/last_rule.vtc
@@ -1,7 +1,7 @@
 varnishtest "Verify logging of last final rule"
-feature ignore_unknown_macro
 
-#REQUIRE_VERSION=2.6
+feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.6-dev0)'"
+feature ignore_unknown_macro
 
 server s1 {
 rxreq
-- 
2.35.1