Makefile.am: Integrate testsuites

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>

diff --git a/.gitignore b/.gitignore
index a206fb4870bc899b91bfa9bdf57f28394c36b252..ec4e44cad8aa759343a798635cc9ea5a70bdb0b6 100644 (file)
--- 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 61604d32e6131e3fc86f9e2e49e9ae3ebe8caab2..451c3cb2d58879b5a3102877c131d806f495a974 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,3 +33,5 @@ tarball:
 
 config.status: extensions/GNUmakefile.in \
        include/xtables-version.h.in
+
+TESTS = xlate-test.py iptables-test.py iptables/tests/shell/run-tests.sh