ofpbuf: Update msg when resizing ofpbuf.

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

diff --git a/tests/automake.mk b/tests/automake.mk
index 50d8ad2..8b54764 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -51,6 +51,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 \
@@ -80,7 +81,9 @@ TESTSUITE_AT = \
        tests/rstp.at \
        tests/interface-reconfigure.at \
        tests/vlog.at \
-       tests/vtep-ctl.at
+       tests/vtep-ctl.at \
+       tests/auto-attach.at \
+       tests/ovn.at
 
 KMOD_TESTSUITE_AT = \
        tests/kmod-testsuite.at \
@@ -92,7 +95,7 @@ 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)
@@ -140,6 +143,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 \
@@ -198,10 +202,17 @@ 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
-       patch -p0 $@.tmp $(TESTSUITE_PATCH)
        $(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
@@ -234,7 +245,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 $@
@@ -271,6 +282,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 \
@@ -281,14 +294,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