projects / cascardo / ovs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add support for connection tracking.
[cascardo/ovs.git] / tests / automake.mk
diff --git a/tests/automake.mk b/tests/automake.mk
index 2e8d213..5267be1 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -1,12 +1,16 @@
 EXTRA_DIST += \
        $(COMMON_MACROS_AT) \
        $(TESTSUITE_AT) \
-       $(KMOD_TESTSUITE_AT) \
+       $(SYSTEM_TESTSUITE_AT) \
+       $(SYSTEM_KMOD_TESTSUITE_AT) \
+       $(SYSTEM_USERSPACE_TESTSUITE_AT) \
        $(TESTSUITE) \
-       $(KMOD_TESTSUITE) \
+       $(SYSTEM_KMOD_TESTSUITE) \
+       $(SYSTEM_USERSPACE_TESTSUITE) \
        tests/atlocal.in \
        $(srcdir)/package.m4 \
-       $(srcdir)/tests/testsuite
+       $(srcdir)/tests/testsuite \
+       $(srcdir)/tests/testsuite.patch
 
 COMMON_MACROS_AT = \
        tests/ovsdb-macros.at \
@@ -50,6 +54,7 @@ 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 \
@@ -79,18 +84,34 @@ TESTSUITE_AT = \
        tests/rstp.at \
        tests/interface-reconfigure.at \
        tests/vlog.at \
-       tests/vtep-ctl.at
-
-KMOD_TESTSUITE_AT = \
-       tests/kmod-testsuite.at \
-       tests/kmod-macros.at \
-       tests/kmod-traffic.at
+       tests/vtep-ctl.at \
+       tests/auto-attach.at \
+       tests/ovn.at \
+       tests/ovn-nbctl.at \
+       tests/ovn-sbctl.at \
+       tests/ovn-controller.at \
+       tests/ovn-controller-vtep.at
+
+SYSTEM_KMOD_TESTSUITE_AT = \
+       tests/system-common-macros.at \
+       tests/system-kmod-testsuite.at \
+       tests/system-kmod-macros.at
+
+SYSTEM_USERSPACE_TESTSUITE_AT = \
+       tests/system-userspace-testsuite.at \
+       tests/system-userspace-macros.at
+
+SYSTEM_TESTSUITE_AT = \
+       tests/system-common-macros.at \
+       tests/system-traffic.at
 
 TESTSUITE = $(srcdir)/tests/testsuite
-KMOD_TESTSUITE = $(srcdir)/tests/kmod-testsuite
+TESTSUITE_PATCH = $(srcdir)/tests/testsuite.patch
+SYSTEM_KMOD_TESTSUITE = $(srcdir)/tests/system-kmod-testsuite
+SYSTEM_USERSPACE_TESTSUITE = $(srcdir)/tests/system-userspace-testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal
 
-AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests
+AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests:$(PTHREAD_WIN32_DIR_DLL):ovn:ovn/controller-vtep:ovn/northd:ovn/utilities:ovn/controller
 
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
        $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
@@ -138,6 +159,7 @@ valgrind_wrappers = \
        tests/valgrind/test-lockfile \
        tests/valgrind/test-multipath \
        tests/valgrind/test-odp \
+       tests/valgrind/test-ofpbuf \
        tests/valgrind/test-ovsdb \
        tests/valgrind/test-packets \
        tests/valgrind/test-random \
@@ -183,24 +205,39 @@ check-ryu: all
 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)
+check-kernel: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE)
+       $(SHELL) '$(SYSTEM_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)
+check-kmod: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE)
        $(MAKE) modules_install
        modprobe -r openvswitch
        $(MAKE) check-kernel
 
+check-system-userspace: all tests/atconfig tests/atlocal $(SYSTEM_USERSPACE_TESTSUITE)
+       $(SHELL) '$(SYSTEM_USERSPACE_TESTSUITE)' -C tests  AUTOTEST_PATH='$(AUTOTEST_PATH)' $(TESTSUITEFLAGS)
+
 clean-local:
        test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
+
+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
+
+$(SYSTEM_KMOD_TESTSUITE): package.m4 $(SYSTEM_TESTSUITE_AT) $(SYSTEM_KMOD_TESTSUITE_AT) $(COMMON_MACROS_AT)
+       $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+       $(AM_V_at)mv $@.tmp $@
 
-$(KMOD_TESTSUITE): package.m4 $(KMOD_TESTSUITE_AT) $(COMMON_MACROS_AT)
+$(SYSTEM_USERSPACE_TESTSUITE): package.m4 $(SYSTEM_TESTSUITE_AT) $(SYSTEM_USERSPACE_TESTSUITE_AT) $(COMMON_MACROS_AT)
        $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
        $(AM_V_at)mv $@.tmp $@
 
@@ -216,10 +253,8 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
        } >'$(srcdir)/package.m4'
 
 noinst_PROGRAMS += tests/test-ovsdb
-tests_test_ovsdb_SOURCES = \
-       tests/test-ovsdb.c \
-       tests/idltest.c \
-       tests/idltest.h
+tests_test_ovsdb_SOURCES = tests/test-ovsdb.c
+nodist_tests_test_ovsdb_SOURCES = tests/idltest.c tests/idltest.h
 EXTRA_DIST += tests/uuidfilt.pl tests/ovsdb-monitor-sort.pl
 tests_test_ovsdb_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 
@@ -231,7 +266,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 $@
@@ -268,6 +303,8 @@ tests_ovstest_SOURCES = \
        tests/test-multipath.c \
        tests/test-netflow.c \
        tests/test-odp.c \
+       tests/test-ofpbuf.c \
+       tests/test-ovn.c \
        tests/test-packets.c \
        tests/test-random.c \
        tests/test-reconnect.c \
@@ -278,14 +315,15 @@ 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 += \
        tests/test-unix-socket.c
 endif
 
-tests_ovstest_LDADD = lib/libopenvswitch.la
+tests_ovstest_LDADD = lib/libopenvswitch.la ovn/lib/libovn.la
 dist_check_SCRIPTS = tests/flowgen.pl
 
 noinst_PROGRAMS += tests/test-strtok_r
@@ -300,6 +338,7 @@ CHECK_PYFILES = \
        tests/test-daemon.py \
        tests/test-json.py \
        tests/test-jsonrpc.py \
+       tests/test-l7.py \
        tests/test-ovsdb.py \
        tests/test-reconnect.py \
        tests/MockXenAPI.py \
Unnamed repository; edit this file 'description' to name the repository.