Merge "master" into "ovn".
[cascardo/ovs.git] / tests / automake.mk
index e63fb19..3f57114 100644 (file)
@@ -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 \
@@ -280,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 \
@@ -298,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