1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REGTESTS: run-regtests: match both "HAProxy" and "HA-Proxy" in the version

Browse Source 
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".
This commit is contained in:
Willy Tarreau 2021-05-09 06:12:41 +02:00
parent 9f0843f4e2
commit 5f3448f6de
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/run-regtests.sh
View File

@ -345,7 +345,7 @@ if [ $preparefailed ]; then
fi fi
{ read HAPROXY_VERSION; read TARGET; read FEATURES; read SERVICES; } << EOF { 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 EOF
HAPROXY_VERSION=$(echo $HAPROXY_VERSION | cut -d " " -f 3) HAPROXY_VERSION=$(echo $HAPROXY_VERSION | cut -d " " -f 3)