Merge "master" into "ovn".

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

diff --git a/tests/automake.mk b/tests/automake.mk
index 7c699b2..3f57114 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -82,7 +82,8 @@ TESTSUITE_AT = \
        tests/interface-reconfigure.at \
        tests/vlog.at \
        tests/vtep-ctl.at \
-       tests/auto-attach.at
+       tests/auto-attach.at \
+       tests/ovn.at
 
 KMOD_TESTSUITE_AT = \
        tests/kmod-testsuite.at \
@@ -200,10 +201,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
+       $(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
@@ -273,6 +281,7 @@ tests_ovstest_SOURCES = \
        tests/test-multipath.c \
        tests/test-netflow.c \
        tests/test-odp.c \
+       tests/test-ovn.c \
        tests/test-packets.c \
        tests/test-random.c \
        tests/test-reconnect.c \
@@ -291,7 +300,7 @@ 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