diff options
| author | Phil Sutter <phil@nwl.cc> | 2024-10-29 12:21:54 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2024-11-05 18:10:24 +0100 |
| commit | cdbd798286270b6ad65eb4cfe3a8933430651d0b (patch) | |
| tree | 6dd1669a3d906343e6c80563f28556acff54b19e | |
| parent | 29d78e196c771a8cc0788397a504b1b8c9e40e6e (diff) | |
tests: shell: Fix for 'make distcheck'
The target performs a "VPATH build", so built binaries are not put into
the same directory tree as the test script itself. For lack of a better
way to detect this, assume $PWD in this situation remains being the
build tree's TLD and check if binaries are present in there.
Signed-off-by: Phil Sutter <phil@nwl.cc>
| -rwxr-xr-x | iptables/tests/shell/run-tests.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/iptables/tests/shell/run-tests.sh b/iptables/tests/shell/run-tests.sh index 11256905..2ad259c2 100755 --- a/iptables/tests/shell/run-tests.sh +++ b/iptables/tests/shell/run-tests.sh @@ -87,6 +87,17 @@ if [ "$HOST" != "y" ]; then XTABLES_LEGACY_MULTI="$(dirname $0)/../../xtables-legacy-multi" export XTABLES_LIBDIR=${TESTDIR}/../../../extensions + + # maybe this is 'make distcheck' calling us from a build tree + if [ ! -e "$XTABLES_NFT_MULTI" -a \ + ! -e "$XTABLES_LEGACY_MULTI" -a \ + -e "./iptables/xtables-nft-multi" -a \ + -e "./iptables/xtables-legacy-multi" ]; then + msg_warn "Running in separate build-tree, using binaries from $PWD/iptables" + XTABLES_NFT_MULTI="$PWD/iptables/xtables-nft-multi" + XTABLES_LEGACY_MULTI="$PWD/iptables/xtables-legacy-multi" + export XTABLES_LIBDIR="$PWD/extensions" + fi else XTABLES_NFT_MULTI="xtables-nft-multi" XTABLES_LEGACY_MULTI="xtables-legacy-multi" |