From 87586e15951dfd007a13b52adf421aa45c0047a9 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Wed, 27 Mar 2019 13:52:39 +0100
Subject: [PATCH] REGTEST: script: make the script use the new features list

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.
---
 scripts/run-regtests.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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