From: Tim Duesterhus <tim@bastelstu.be>
Date: Fri, 11 Jun 2021 17:56:18 +0000 (+0200)
Subject: REGTESTS: Remove support for REQUIRE_BINARIES
X-Git-Tag: v2.5-dev1~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8727614dc4046e91997ecce421bcb6a5537cac93;p=thirdparty%2Fhaproxy.git

REGTESTS: Remove support for REQUIRE_BINARIES

This is no longer used since the migration to the native `feature cmd`
functionality.
---

diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index b542f24f83..6eadc06c70 100755
--- a/scripts/run-regtests.sh
+++ b/scripts/run-regtests.sh
@@ -56,9 +56,6 @@ _help()
     #REQUIRE_VERSION=0.0
     #REQUIRE_VERSION_BELOW=99.9
 
-    # To define required binaries for a test:
-    #REQUIRE_BINARIES=socat,curl
-
   Configure environment variables to set the haproxy and vtest binaries to use
     setenv HAPROXY_PROGRAM /usr/local/sbin/haproxy
     setenv VTEST_PROGRAM /usr/local/bin/vtest
@@ -128,7 +125,6 @@ _findtests() {
     require_options="$(sed -ne 's/^#REQUIRE_OPTIONS=//p' "$i" | sed  -e 's/,/ /g')"
     require_services="$(sed -ne 's/^#REQUIRE_SERVICES=//p' "$i" | sed  -e 's/,/ /g')"
     exclude_targets="$(sed -ne 's/^#EXCLUDE_TARGETS=//p' "$i" | sed  -e 's/,/ /g')"
-    require_binaries="$(sed -ne 's/^#REQUIRE_BINARIES=//p' "$i" | sed  -e 's/,/ /g')"
     if [ $any_test -ne 1 ] ; then
         regtest_type="$(sed -ne 's/^#REGTEST_TYPE=//p' "$i")"
         if [ -z $regtest_type ] ; then
@@ -205,14 +201,6 @@ _findtests() {
       fi
     done
 
-    for requiredbin in $require_binaries; do
-      if ! command -v $requiredbin >/dev/null 2>&1
-      then
-        echo "  Skip $i because '"$requiredbin"' is not installed"
-        skiptest=1
-      fi
-    done
-
     if [ -z $skiptest ]; then
       echo "  Add test: $i"
       testlist="$testlist $i"