Merge branch 'mainstream'

[sliver-openvswitch.git] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 755d88e..f2e0edc 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -21,6 +21,8 @@ TESTSUITE_AT = \
        tests/ovs-ofctl.at \
        tests/odp.at \
        tests/multipath.at \
+       tests/bfd.at \
+       tests/cfm.at \
        tests/lacp.at \
        tests/learn.at \
        tests/vconn.at \
@@ -31,7 +33,6 @@ TESTSUITE_AT = \
        tests/json.at \
        tests/jsonrpc.at \
        tests/jsonrpc-py.at \
-       tests/timeval.at \
        tests/tunnel.at \
        tests/lockfile.at \
        tests/reconnect.at \
@@ -63,11 +64,12 @@ TESTSUITE_AT = \
        tests/ovs-xapi-sync.at \
        tests/stp.at \
        tests/interface-reconfigure.at \
-       tests/vlog.at
+       tests/vlog.at \
+       tests/vtep-ctl.at
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal
 
-AUTOTEST_PATH = utilities:vswitchd:ovsdb:tests
+AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests
 
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
        $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
@@ -121,7 +123,6 @@ valgrind_wrappers = \
        tests/valgrind/test-reconnect \
        tests/valgrind/test-sha1 \
        tests/valgrind/test-stp \
-       tests/valgrind/test-timeval \
        tests/valgrind/test-type-props \
        tests/valgrind/test-unix-socket \
        tests/valgrind/test-uuid \
@@ -292,10 +293,6 @@ noinst_PROGRAMS += tests/test-sha1
 tests_test_sha1_SOURCES = tests/test-sha1.c
 tests_test_sha1_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
-noinst_PROGRAMS += tests/test-timeval
-tests_test_timeval_SOURCES = tests/test-timeval.c
-tests_test_timeval_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-
 noinst_PROGRAMS += tests/test-strtok_r
 tests_test_strtok_r_SOURCES = tests/test-strtok_r.c