SCRIPT: run-regtests: avoid several calls to grep to test for features
grep is used in the arguments loops to check for features such as OPENSSL
or LUA or services like prometheus-exporter. Let's just look for the words
inside the list, which requires to prepend a delimitor at the beginning of
the list and add one at the end.
diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index 5acd5a1..1af9350 100755
--- a/scripts/run-regtests.sh
+++ b/scripts/run-regtests.sh
@@ -197,7 +197,7 @@
IFS="|"; set -- $requiredoption; IFS=$OLDIFS; alternatives="$*"
found=
for alt in $alternatives; do
- if echo "$FEATURES" | grep -qw "\+$alt"; then
+ if [ -z "${FEATURES_PATTERN##* +$alt *}" ]; then
found=1;
fi
done
@@ -211,7 +211,7 @@
IFS="|"; set -- $requiredservice; IFS=$OLDIFS; alternatives="$*"
found=
for alt in $alternatives; do
- if echo "$SERVICES" | grep -qw "$alt"; then
+ if [ -z "${SERVICES_PATTERN##* $alt *}" ]; then
found=1;
fi
done
@@ -345,6 +345,9 @@
HAPROXY_VERSION=$(echo $HAPROXY_VERSION | cut -d " " -f 3)
echo "Testing with haproxy version: $HAPROXY_VERSION"
+FEATURES_PATTERN=" $FEATURES "
+SERVICES_PATTERN=" $SERVICES "
+
TESTRUNDATETIME="$(date '+%Y-%m-%d_%H-%M-%S')"
mkdir -p "$TESTDIR" || exit 1