diff mbox series

[iptables,2/2] Makefile.am: Integrate testsuites

Message ID 20221015110256.15921-2-phil@nwl.cc
State Changes Requested
Headers show
Series [iptables,1/2] tests: Adjust testsuite return codes to automake guidelines | expand

Commit Message

Phil Sutter Oct. 15, 2022, 11:02 a.m. UTC 
Support calling 'make check' in topdir to run all three testsuites.
While updating .gitignore, also add 'configure~' my autotools create and
the tags file.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 .gitignore                | 12 ++++++++++++
 Makefile.am               |  2 ++
 extensions/GNUmakefile.in |  5 ++++-
 3 files changed, 18 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/.gitignore b/.gitignore
index a206fb4870bc8..ec4e44cad8aa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@  Makefile.in
 /build-aux/
 /config.*
 /configure
+/configure~
 /libtool
 /stamp-h1
 /iptables/iptables-apply.8
@@ -29,3 +30,14 @@  Makefile.in
 
 # vim/nano swap file
 *.swp
+
+/tags
+
+# make check results
+/test-suite.log
+/iptables-test.py.log
+/iptables-test.py.trs
+/xlate-test.py.log
+/xlate-test.py.trs
+iptables/tests/shell/run-tests.sh.log
+iptables/tests/shell/run-tests.sh.trs
diff --git a/Makefile.am b/Makefile.am
index 799bf8b81c74a..4574b55e2433d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,3 +31,5 @@  endif
 
 config.status: extensions/GNUmakefile.in \
 	include/xtables-version.h.in
+
+TESTS = xlate-test.py iptables-test.py iptables/tests/shell/run-tests.sh
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 3c68f8decd13f..f20ea4fd95eae 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -79,7 +79,7 @@  targets_install :=
 
 .SECONDARY:
 
-.PHONY: all install uninstall clean distclean FORCE
+.PHONY: all install uninstall clean distclean FORCE check
 
 all: ${targets}
 
@@ -307,3 +307,6 @@  matches.man: .initext.dd .initextb.dd .initexta.dd .initext4.dd .initext6.dd $(w
 
 targets.man: .initext.dd .initextb.dd .initexta.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
 	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pfb_build_mod} ${pfa_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
+
+# empty check target to satisfy 'make check' in topdir
+check: