mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-22 12:20:00 +00:00
REGTESTS: Remove support for REQUIRE_BINARIES
This is no longer used since the migration to the native `feature cmd` functionality.
This commit is contained in:
parent
4ee192f072
commit
8727614dc4
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user