ovsdb: Correctly implement conditions that include multiple clauses.

[openvswitch] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index dcd7f97a5c52821a384174a3ef1f3eb93214a809..1236a261315d368dcb3d8a2dc94d61b54dd4f0e7 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -53,11 +53,11 @@ TESTSUITE_AT = \
        tests/ovs-vsctl.at \
        tests/ovs-monitor-ipsec.at \
        tests/ovs-xapi-sync.at \
+       tests/stp.at \
        tests/interface-reconfigure.at \
        tests/vlog.at
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal
-EXTRA_DIST += tests/compare-odp-actions.pl
 
 AUTOTEST_PATH = utilities:vswitchd:ovsdb:tests
 
@@ -69,6 +69,7 @@ check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 lcov_wrappers = \
        tests/lcov/ovs-appctl \
        tests/lcov/ovs-vsctl \
+       tests/lcov/ovs-vswitchd \
        tests/lcov/ovsdb-client \
        tests/lcov/ovsdb-server \
        tests/lcov/ovsdb-tool \
@@ -92,6 +93,7 @@ lcov_wrappers = \
        tests/lcov/test-random \
        tests/lcov/test-reconnect \
        tests/lcov/test-sha1 \
+       tests/lcov/test-stp \
        tests/lcov/test-timeval \
        tests/lcov/test-type-props \
        tests/lcov/test-unix-socket \
@@ -123,6 +125,7 @@ check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
 valgrind_wrappers = \
        tests/valgrind/ovs-appctl \
        tests/valgrind/ovs-vsctl \
+       tests/valgrind/ovs-vswitchd \
        tests/valgrind/ovsdb-client \
        tests/valgrind/ovsdb-server \
        tests/valgrind/ovsdb-tool \
@@ -141,12 +144,12 @@ valgrind_wrappers = \
        tests/valgrind/test-lockfile \
        tests/valgrind/test-multipath \
        tests/valgrind/test-odp \
-       tests/valgrind/test-openflowd \
        tests/valgrind/test-ovsdb \
        tests/valgrind/test-packets \
        tests/valgrind/test-random \
        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 \
@@ -245,18 +248,6 @@ noinst_PROGRAMS += tests/test-multipath
 tests_test_multipath_SOURCES = tests/test-multipath.c
 tests_test_multipath_LDADD = lib/libopenvswitch.a
 
-noinst_PROGRAMS += tests/test-openflowd
-EXTRA_DIST += tests/test-openflowd.8.in
-DISTCLEANFILES += tests/test-openflowd.8
-noinst_man_MANS += tests/ovs-openflowd.8
-tests_test_openflowd_SOURCES = tests/test-openflowd.c
-tests_test_openflowd_LDADD = \
-       ofproto/libofproto.a \
-       lib/libsflow.a \
-       lib/libopenvswitch.a \
-       $(SSL_LIBS)
-
-
 noinst_PROGRAMS += tests/test-packets
 tests_test_packets_SOURCES = tests/test-packets.c
 tests_test_packets_LDADD = lib/libopenvswitch.a
@@ -265,6 +256,10 @@ noinst_PROGRAMS += tests/test-random
 tests_test_random_SOURCES = tests/test-random.c
 tests_test_random_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-stp
+tests_test_stp_SOURCES = tests/test-stp.c
+tests_test_stp_LDADD = lib/libopenvswitch.a
+
 noinst_PROGRAMS += tests/test-unix-socket
 tests_test_unix_socket_SOURCES = tests/test-unix-socket.c
 tests_test_unix_socket_LDADD = lib/libopenvswitch.a