netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH nft 1/2] tests/shell: honor .nodump file for tests without nft dumps
@ 2023-09-07 21:05 Thomas Haller
  2023-09-07 21:05 ` [PATCH nft 2/2] tests/shell: add missing ".nodump" file for tests without dumps Thomas Haller
  0 siblings, 1 reply; 4+ messages in thread
From: Thomas Haller @ 2023-09-07 21:05 UTC (permalink / raw)
  To: NetFilter; +Cc: Thomas Haller

For many tests, the dump is not stable or useful to test. Those tests
don't have a .nft file in the dumps directory, and don't have it
checked.

DUMPGEN=y generates a new dump file, if the "dumps/" directory exists.
Omitting that directory is a way to prevent the generation of the file.
However, many such tests share their directory with tests that do have dumps.

When running tests with DUMPGEN=y, a lot of new files get generated.
Those files are not meant to be compared or committed to git.

Whether a test has a dump file, is part of the test. The absence of the
dump file should also be indicated and committed to git.

Add a way to opt-out from such generating such dumps by having .nodump
files instead of the .nft dump.

Later we should add unit tests that checks that no test has both a .nft
and a .nodump file in git, that the .nodump file is always empty, and
that every .nft/.nodump file has a corresponding test committed to git.

Signed-off-by: Thomas Haller <thaller@redhat.com>
---
 tests/shell/helpers/test-wrapper.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/shell/helpers/test-wrapper.sh b/tests/shell/helpers/test-wrapper.sh
index 43b3aa09ef26..006ead554aeb 100755
--- a/tests/shell/helpers/test-wrapper.sh
+++ b/tests/shell/helpers/test-wrapper.sh
@@ -49,6 +49,7 @@ read tainted_after < /proc/sys/kernel/tainted
 
 DUMPPATH="$TESTDIR/dumps"
 DUMPFILE="$DUMPPATH/$TESTBASE.nft"
+NODUMPFILE="$DUMPPATH/$TESTBASE.nodump"
 
 dump_written=
 rc_dump=
@@ -60,9 +61,14 @@ rc_dump=
 #
 # It also will only happen for tests, that have a "$DUMPPATH" directory. There
 # might be tests, that don't want to have dumps created. The existence of the
-# directory controls that.
-if [ "$rc_test" -eq 0 -a "$DUMPGEN" = y -a -d "$DUMPPATH" ] ; then
+# directory controls that. Tests that have a "$NODUMPFILE" file, don't get a dump generated.
+if [ "$rc_test" -eq 0 -a "$DUMPGEN" = y -a -d "$DUMPPATH" -a ! -f "$NODUMPFILE" ] ; then
 	dump_written=y
+	if [ ! -f "$DUMPFILE" ] ; then
+		# No dumpfile exists yet. We generate both a .nft and a .nodump
+		# file. The user can pick which one to commit to git.
+		: > "$NODUMPFILE"
+	fi
 	cat "$NFT_TEST_TESTTMPDIR/ruleset-after" > "$DUMPFILE"
 fi
 
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-08 10:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-07 21:05 [PATCH nft 1/2] tests/shell: honor .nodump file for tests without nft dumps Thomas Haller
2023-09-07 21:05 ` [PATCH nft 2/2] tests/shell: add missing ".nodump" file for tests without dumps Thomas Haller
2023-09-08 10:22   ` Florian Westphal
2023-09-08 10:42     ` Thomas Haller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).