From: Willy Tarreau <w@1wt.eu>
Date: Sun, 9 May 2021 04:12:41 +0000 (+0200)
Subject: REGTESTS: run-regtests: match both "HAProxy" and "HA-Proxy" in the version
X-Git-Tag: v2.4-dev19~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f3448f6dec0d08110793cda39e1f2fade7d4194;p=thirdparty%2Fhaproxy.git

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".
---

diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index b3e4b13dd8..37668c9e1a 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)