RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-03 18:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

REGTESTS: Remove support for REQUIRE_BINARIES

Browse Source 
This is no longer used since the migration to the native `feature cmd`
functionality.
This commit is contained in:
Tim Duesterhus 2021-06-11 19:56:18 +02:00 committed by Willy Tarreau
parent 4ee192f072
commit 8727614dc4
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/run-regtests.sh
View File

@ -56,9 +56,6 @@ _help()
#REQUIRE_VERSION=0.0 #REQUIRE_VERSION=0.0
#REQUIRE_VERSION_BELOW=99.9 #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 Configure environment variables to set the haproxy and vtest binaries to use
setenv HAPROXY_PROGRAM /usr/local/sbin/haproxy setenv HAPROXY_PROGRAM /usr/local/sbin/haproxy
setenv VTEST_PROGRAM /usr/local/bin/vtest 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_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')" 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')" 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 if [ $any_test -ne 1 ] ; then
regtest_type="$(sed -ne 's/^#REGTEST_TYPE=//p' "$i")" regtest_type="$(sed -ne 's/^#REGTEST_TYPE=//p' "$i")"
if [ -z $regtest_type ] ; then if [ -z $regtest_type ] ; then
@ -205,14 +201,6 @@ _findtests() {
fi fi
done 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 if [ -z $skiptest ]; then
echo " Add test: $i" echo " Add test: $i"
testlist="$testlist $i" testlist="$testlist $i"