From 5f3448f6dec0d08110793cda39e1f2fade7d4194 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 9 May 2021 06:12:41 +0200 Subject: [PATCH] REGTESTS: run-regtests: match both "HAProxy" and "HA-Proxy" in the version The script checks the HAProxy version and was looking for "HA-Proxy" which is hard-coded in haproxy.c, let's relax the test to also accept "HAProxy". --- scripts/run-regtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh index b3e4b13dd..37668c9e1 100755 --- a/scripts/run-regtests.sh +++ b/scripts/run-regtests.sh @@ -345,7 +345,7 @@ if [ $preparefailed ]; then fi { read HAPROXY_VERSION; read TARGET; read FEATURES; read SERVICES; } << EOF -$($HAPROXY_PROGRAM $HAPROXY_ARGS -vv | grep 'HA-Proxy version\|TARGET.*=\|^Feature\|^Available services' | sed 's/.* [:=] //') +$($HAPROXY_PROGRAM $HAPROXY_ARGS -vv | grep 'HA-\?Proxy version\|TARGET.*=\|^Feature\|^Available services' | sed 's/.* [:=] //') EOF HAPROXY_VERSION=$(echo $HAPROXY_VERSION | cut -d " " -f 3)