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

REGTEST: script: make the script use the new features list

Browse Source 
Currently the script only sees options that differ from the default,
which makes it fail on default options that are disabled (such as
threads on the relevant platforms). Let's make it instead extract
the newly introduced feature list and search for an explicit "+" in
front of the desiered feature. This one is known for always being
valid.
This commit is contained in:
Willy Tarreau 2019-03-27 13:52:39 +01:00
parent 824cd00d3b
commit 87586e1595
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/run-regtests.sh
View File

@ -195,7 +195,7 @@ _findtests() {
alternatives=$(echo "$requiredoption" | sed -e 's/|/ /g') alternatives=$(echo "$requiredoption" | sed -e 's/|/ /g')
found= found=
for alt in $alternatives; do for alt in $alternatives; do
if [ -n "$( echo "$OPTIONS" | grep "USE_$alt=1" )" ]; then if echo "$FEATURES" | grep -qw "\+$alt"; then
found=1; found=1;
fi fi
done done
@ -323,8 +323,8 @@ if [ $preparefailed ]; then
exit 1 exit 1
fi fi
{ read HAPROXY_VERSION; read TARGET; read OPTIONS; } << EOF { read HAPROXY_VERSION; read TARGET; read OPTIONS; read FEATURES; } << EOF
$($HAPROXY_PROGRAM -vv |grep 'HA-Proxy version\|TARGET\|OPTIONS' | sed 's/.* = //') $($HAPROXY_PROGRAM -vv |grep 'HA-Proxy version\|TARGET.*=\|OPTIONS.*=\|^Feature' | sed 's/.* [:=] //')
EOF EOF
HAPROXY_VERSION=$(echo $HAPROXY_VERSION | cut -d " " -f 3) HAPROXY_VERSION=$(echo $HAPROXY_VERSION | cut -d " " -f 3)
@ -402,7 +402,7 @@ if [ $TARGET = cygwin ] ; then
fi fi
echo "Target : $TARGET" echo "Target : $TARGET"
echo "Options : $OPTIONS" echo "Options : $FEATURES"
echo "########################## Gathering tests to run ##########################" echo "########################## Gathering tests to run ##########################"
# if 'use-htx' option is set, but HAProxy version is lower to 1.9, disable it # if 'use-htx' option is set, but HAProxy version is lower to 1.9, disable it