tests: Reduce user burden for running "make check".

[cascardo/ovs.git] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 7422f97..44b528a 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -1,12 +1,22 @@
 EXTRA_DIST += \
+       $(COMMON_MACROS_AT) \
        $(TESTSUITE_AT) \
+       $(KMOD_TESTSUITE_AT) \
        $(TESTSUITE) \
+       $(KMOD_TESTSUITE) \
        tests/atlocal.in \
        $(srcdir)/package.m4 \
-       $(srcdir)/tests/testsuite
+       $(srcdir)/tests/testsuite \
+       $(srcdir)/tests/testsuite.patch
+
+COMMON_MACROS_AT = \
+       tests/ovsdb-macros.at \
+       tests/ovs-macros.at \
+       tests/ofproto-macros.at
+
 TESTSUITE_AT = \
        tests/testsuite.at \
-       tests/ovsdb-macros.at \
+       tests/completion.at \
        tests/library.at \
        tests/heap.at \
        tests/bundle.at \
@@ -20,6 +30,7 @@ TESTSUITE_AT = \
        tests/ofp-errors.at \
        tests/ovs-ofctl.at \
        tests/odp.at \
+       tests/mpls-xlate.at \
        tests/multipath.at \
        tests/bfd.at \
        tests/cfm.at \
@@ -40,10 +51,10 @@ TESTSUITE_AT = \
        tests/reconnect.at \
        tests/ovs-vswitchd.at \
        tests/dpif-netdev.at \
+       tests/dpctl.at \
        tests/ofproto-dpif.at \
        tests/bridge.at \
        tests/vlan-splinters.at \
-       tests/ofproto-macros.at \
        tests/ofproto.at \
        tests/ovsdb.at \
        tests/ovsdb-log.at \
@@ -70,11 +81,20 @@ TESTSUITE_AT = \
        tests/rstp.at \
        tests/interface-reconfigure.at \
        tests/vlog.at \
-       tests/vtep-ctl.at
+       tests/vtep-ctl.at \
+       tests/auto-attach.at
+
+KMOD_TESTSUITE_AT = \
+       tests/kmod-testsuite.at \
+       tests/kmod-macros.at \
+       tests/kmod-traffic.at
+
 TESTSUITE = $(srcdir)/tests/testsuite
+TESTSUITE_PATCH = $(srcdir)/tests/testsuite.patch
+KMOD_TESTSUITE = $(srcdir)/tests/kmod-testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal
 
-AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests
+AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests:$(PTHREAD_WIN32_DIR_DLL)
 
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
        $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
@@ -166,11 +186,33 @@ check-ryu: all
        $(AM_V_at)srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-ryu
 EXTRA_DIST += tests/run-ryu
 \f
+# Run kmod tests. Assume kernel modules has been installed or linked into the kernel
+check-kernel: all tests/atconfig tests/atlocal $(KMOD_TESTSUITE)
+       $(SHELL) '$(KMOD_TESTSUITE)' -C tests  AUTOTEST_PATH='$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
+
+# Testing the out of tree Kernel module
+check-kmod: all tests/atconfig tests/atlocal $(KMOD_TESTSUITE)
+       $(MAKE) modules_install
+       modprobe -r openvswitch
+       $(MAKE) check-kernel
+
 clean-local:
        test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+
+if WIN32
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT) $(TESTSUITE_PATCH)
+       $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o testsuite.tmp $@.at
+       patch -p0 testsuite.tmp $(TESTSUITE_PATCH)
+       $(AM_V_at)mv testsuite.tmp $@
+else
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT)
+       $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+       $(AM_V_at)mv $@.tmp $@
+endif
+
+$(KMOD_TESTSUITE): package.m4 $(KMOD_TESTSUITE_AT) $(COMMON_MACROS_AT)
        $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
        $(AM_V_at)mv $@.tmp $@
 
@@ -201,7 +243,7 @@ tests_test_lib_LDADD = lib/libopenvswitch.la
 # idltest schema and IDL
 OVSIDL_BUILT += tests/idltest.c tests/idltest.h tests/idltest.ovsidl
 IDLTEST_IDL_FILES = tests/idltest.ovsschema tests/idltest.ann
-EXTRA_DIST += $(IDLTEST_IDL_FILES)
+EXTRA_DIST += $(IDLTEST_IDL_FILES) tests/idltest2.ovsschema
 tests/idltest.ovsidl: $(IDLTEST_IDL_FILES)
        $(AM_V_GEN)$(OVSDB_IDLC) -C $(srcdir) annotate $(IDLTEST_IDL_FILES) > $@.tmp && \
        mv $@.tmp $@
@@ -248,7 +290,8 @@ tests_ovstest_SOURCES = \
        tests/test-util.c \
        tests/test-uuid.c \
        tests/test-bitmap.c \
-       tests/test-vconn.c
+       tests/test-vconn.c \
+       tests/test-aa.c
 
 if !WIN32
 tests_ovstest_SOURCES += \