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