From b92573303260736b0f9be9c1a9442ddec7fdcab2 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 9 Aug 2018 18:06:28 +0200 Subject: tests: Fix skipping for recent nft-only tests In an attempt to sanitize shell scripting, exit test in recent testcases was altered, which led to them being skipped even in nft test runs. Drop the quotes so that globbing happens again. While here, improve the check a bit to glob only on leading path part, not also the file name. Also print "skip ..." just like nft-only/0001compat_0 testcase does. Fixes: f1d8508fd6fdc ("tests: Add arptables-{save,restore} testcases") Fixes: fbf0bf7c079d8 ("tests: Add ebtables-{save,restore} testcases") Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- .../tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0') diff --git a/iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 b/iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 index 8bc4d08f..b2ed95e8 100755 --- a/iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 +++ b/iptables/tests/shell/testcases/arptables/0002-arptables-restore-defaults_0 @@ -3,7 +3,7 @@ set -e # there is no legacy backend to test -[[ $XT_MULTI == "*xtables-nft-multi" ]] || exit 0 +[[ $XT_MULTI == */xtables-nft-multi ]] || { echo "skip $XT_MULTI"; exit 0; } # arptables-restore reuses preloaded targets and matches, make sure defaults # apply to consecutive rules using the same target/match as a previous one -- cgit v1.2.3