From 6e322f2ddf1b0c20d1ae8a8c06e115eb2dc76cec Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Sun, 29 Jun 2025 12:13:38 +0200 Subject: [PATCH] tests: shell: move bogons to correct directory These two bogons were never loaded, they have to placed in the "nft-f" subdir. Also add the "nft-j-f" bogon input dir to the ignored files list so their existence is not reported as an error by check-tree.sh. Signed-off-by: Florian Westphal --- .../testcases/bogons/{ => nft-f}/nat_map_and_protocol_assert | 0 .../shell/testcases/bogons/{ => nft-f}/objref_double_free_crash | 0 tools/check-tree.sh | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename tests/shell/testcases/bogons/{ => nft-f}/nat_map_and_protocol_assert (100%) rename tests/shell/testcases/bogons/{ => nft-f}/objref_double_free_crash (100%) diff --git a/tests/shell/testcases/bogons/nat_map_and_protocol_assert b/tests/shell/testcases/bogons/nft-f/nat_map_and_protocol_assert similarity index 100% rename from tests/shell/testcases/bogons/nat_map_and_protocol_assert rename to tests/shell/testcases/bogons/nft-f/nat_map_and_protocol_assert diff --git a/tests/shell/testcases/bogons/objref_double_free_crash b/tests/shell/testcases/bogons/nft-f/objref_double_free_crash similarity index 100% rename from tests/shell/testcases/bogons/objref_double_free_crash rename to tests/shell/testcases/bogons/nft-f/objref_double_free_crash diff --git a/tools/check-tree.sh b/tools/check-tree.sh index e358c9578..92227cb8e 100755 --- a/tools/check-tree.sh +++ b/tools/check-tree.sh @@ -111,7 +111,7 @@ fi ############################################################################## # F=( $(find tests/shell/testcases/ -type f | grep '^tests/shell/testcases/[^/]\+/dumps/[^/]\+\.\(json-nft\|nft\|nodump\)$' -v | sort) ) -IGNORED_FILES=( tests/shell/testcases/bogons/nft-f/* ) +IGNORED_FILES=( tests/shell/testcases/bogons/nft-f/* tests/shell/testcases/bogons/nft-j-f/* ) for f in "${F[@]}" ; do if ! array_contains "$f" "${SHELL_TESTS[@]}" "${IGNORED_FILES[@]}" ; then msg_err "Unexpected file \"$f\"" -- 2.47.2