]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REGTESTS: run-regtests: match both "HAProxy" and "HA-Proxy" in the version
authorWilly Tarreau <w@1wt.eu>
Sun, 9 May 2021 04:12:41 +0000 (06:12 +0200)
committerWilly Tarreau <w@1wt.eu>
Sun, 9 May 2021 04:12:41 +0000 (06:12 +0200)
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

index b3e4b13dd828daab5a3106f7aa5e060832cb0c71..37668c9e1a45341d012f60943bcf1b3e70c9d22b 100755 (executable)
@@ -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)