tests: Run ovs-ofctl under valgrind too, with the "check-valgrind" target.

[openvswitch] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 455fc8bb726b54660af0ededc0816c088a198718..37925823c3bccc9d92c7d995437845ee3ce91ef1 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -8,6 +8,7 @@ TESTSUITE_AT = \
        tests/testsuite.at \
        tests/ovsdb-macros.at \
        tests/library.at \
+       tests/heap.at \
        tests/bundle.at \
        tests/classifier.at \
        tests/check-structs.at \
@@ -18,6 +19,7 @@ TESTSUITE_AT = \
        tests/odp.at \
        tests/multipath.at \
        tests/autopath.at \
+       tests/lacp.at \
        tests/learn.at \
        tests/vconn.at \
        tests/file_name.at \
@@ -58,7 +60,6 @@ TESTSUITE_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,7 +70,9 @@ check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 
 lcov_wrappers = \
        tests/lcov/ovs-appctl \
+       tests/lcov/ovs-ofctl \
        tests/lcov/ovs-vsctl \
+       tests/lcov/ovs-vswitchd \
        tests/lcov/ovsdb-client \
        tests/lcov/ovsdb-server \
        tests/lcov/ovsdb-tool \
@@ -81,6 +84,7 @@ lcov_wrappers = \
        tests/lcov/test-file_name \
        tests/lcov/test-flows \
        tests/lcov/test-hash \
+       tests/lcov/test-heap \
        tests/lcov/test-hmap \
        tests/lcov/test-json \
        tests/lcov/test-jsonrpc \
@@ -124,7 +128,9 @@ check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
 
 valgrind_wrappers = \
        tests/valgrind/ovs-appctl \
+       tests/valgrind/ovs-ofctl \
        tests/valgrind/ovs-vsctl \
+       tests/valgrind/ovs-vswitchd \
        tests/valgrind/ovsdb-client \
        tests/valgrind/ovsdb-server \
        tests/valgrind/ovsdb-tool \
@@ -136,6 +142,7 @@ valgrind_wrappers = \
        tests/valgrind/test-file_name \
        tests/valgrind/test-flows \
        tests/valgrind/test-hash \
+       tests/valgrind/test-heap \
        tests/valgrind/test-hmap \
        tests/valgrind/test-json \
        tests/valgrind/test-jsonrpc \
@@ -143,7 +150,6 @@ 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 \
@@ -224,6 +230,10 @@ noinst_PROGRAMS += tests/test-hash
 tests_test_hash_SOURCES = tests/test-hash.c
 tests_test_hash_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-heap
+tests_test_heap_SOURCES = tests/test-heap.c
+tests_test_heap_LDADD = lib/libopenvswitch.a
+
 noinst_PROGRAMS += tests/test-hmap
 tests_test_hmap_SOURCES = tests/test-hmap.c
 tests_test_hmap_LDADD = lib/libopenvswitch.a
@@ -248,17 +258,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
@@ -271,6 +270,10 @@ noinst_PROGRAMS += tests/test-stp
 tests_test_stp_SOURCES = tests/test-stp.c
 tests_test_stp_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-netflow
+tests_test_netflow_SOURCES = tests/test-netflow.c
+tests_test_netflow_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