I accidently lost "-E' flag on grep. follow up patch attached. сб, 6 авг. 2022 г. в 21:50, Илья Шипицин <[email protected]>:
> > > сб, 6 авг. 2022 г. в 20:59, Willy Tarreau <[email protected]>: > >> On Sat, Aug 06, 2022 at 05:48:56PM +0200, Willy Tarreau wrote: >> > On Fri, Jul 29, 2022 at 09:37:46PM +0500, ???? ??????? wrote: >> > > gentle ping >> > >> > Sorry Ilya, but William is in vacation right now. Since I don't think >> > there's any risk with your patch, I took it. In the worst case should >> > William disagree with it, we could still patch later. >> >> Hmmm I should have been more careful, that broke half of the SSL tests >> on ssl_generate_cert, for example: >> >> >> https://github.com/haproxy/haproxy/runs/7705930410?check_suite_focus=true >> >> It's exactly on the last changed grep expression. I need to go right now, >> so I'll do dev3 later. In the worst case I'll temporarily revert the >> series. >> > > I'll have a look soon > > >> >> Cheers, >> Willy >> >
From 73ec541d93af8598dc9afb1a84149bb88e3661c4 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <[email protected]> Date: Sat, 6 Aug 2022 22:40:41 +0500 Subject: [PATCH] REGTESTS: ssl: fix grep invocation to use extended regex in ssl_generate_certificate.vtc in 2f2a2884b7464ccb56469cb94d8a1ae4015a8cb6 grep should have use regex flag -E, but flag was lost by mistake --- reg-tests/ssl/ssl_generate_certificate.vtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reg-tests/ssl/ssl_generate_certificate.vtc b/reg-tests/ssl/ssl_generate_certificate.vtc index b3d9201ae..96549df54 100644 --- a/reg-tests/ssl/ssl_generate_certificate.vtc +++ b/reg-tests/ssl/ssl_generate_certificate.vtc @@ -164,5 +164,5 @@ shell { } shell { - echo "Q" | openssl s_client -unix "${tmpdir}/ssl_P-384.sock" -servername server.ecdsa.com 2>/dev/null| grep "Temp Key: ECDH,.+, 384 bits" + echo "Q" | openssl s_client -unix "${tmpdir}/ssl_P-384.sock" -servername server.ecdsa.com 2>/dev/null| grep -E "Temp Key: ECDH,.+, 384 bits" } -- 2.37.1
