From f51cae64e9064ae503586ab5a4572ee3bea97de2 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 25 Sep 2019 12:54:55 +0200 Subject: tests: shell: Support running for legacy/nft only After some changes, one might want to test a single variant only. Allow this by supporting -n/--nft and -l/--legacy parameters, each disabling the other variant. Signed-off-by: Phil Sutter Acked-by: Florian Westphal --- iptables/tests/shell/run-tests.sh | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/iptables/tests/shell/run-tests.sh b/iptables/tests/shell/run-tests.sh index 7bef09f7..d71c1372 100755 --- a/iptables/tests/shell/run-tests.sh +++ b/iptables/tests/shell/run-tests.sh @@ -38,6 +38,14 @@ while [ -n "$1" ]; do HOST=y shift ;; + -l|--legacy) + LEGACY_ONLY=y + shift + ;; + -n|--nft) + NFT_ONLY=y + shift + ;; *${RETURNCODE_SEPARATOR}+([0-9])) SINGLE+=" $1" VERBOSE=y @@ -98,19 +106,23 @@ do_test() { } echo "" -for testfile in $(find_tests);do - do_test "$testfile" "$XTABLES_LEGACY_MULTI" -done -msg_info "legacy results: [OK] $ok [FAILED] $failed [TOTAL] $((ok+failed))" +if [ "$NFT_ONLY" != "y" ]; then + for testfile in $(find_tests);do + do_test "$testfile" "$XTABLES_LEGACY_MULTI" + done + msg_info "legacy results: [OK] $ok [FAILED] $failed [TOTAL] $((ok+failed))" +fi legacy_ok=$ok legacy_fail=$failed ok=0 failed=0 -for testfile in $(find_tests);do - do_test "$testfile" "$XTABLES_NFT_MULTI" -done -msg_info "nft results: [OK] $ok [FAILED] $failed [TOTAL] $((ok+failed))" +if [ "$LEGACY_ONLY" != "y" ]; then + for testfile in $(find_tests);do + do_test "$testfile" "$XTABLES_NFT_MULTI" + done + msg_info "nft results: [OK] $ok [FAILED] $failed [TOTAL] $((ok+failed))" +fi ok=$((legacy_ok+ok)) failed=$((legacy_fail+failed)) -- cgit v1.2.3