From: Phil Sutter <phil@nwl.cc>
To: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH] tests: shell: Fix for 'make distcheck'
Date: Tue, 29 Oct 2024 12:29:38 +0100 [thread overview]
Message-ID: <20241029112938.19873-1-phil@nwl.cc> (raw)
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>
---
iptables/tests/shell/run-tests.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/iptables/tests/shell/run-tests.sh b/iptables/tests/shell/run-tests.sh
index 1125690583b46..2ad259c21644c 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"
--
2.47.0
next reply other threads:[~2024-10-29 11:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-29 11:29 Phil Sutter [this message]
2024-11-05 23:02 ` [iptables PATCH] tests: shell: Fix for 'make distcheck' Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241029112938.19873-1-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox