unit-test: merge test-heap into ovstest

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

diff --git a/tests/automake.mk b/tests/automake.mk
index fc584d6..6c59c6e 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -109,7 +109,6 @@ valgrind_wrappers = \
        tests/valgrind/test-file_name \
        tests/valgrind/test-flows \
        tests/valgrind/test-hash \
-       tests/valgrind/test-heap \
        tests/valgrind/test-hindex \
        tests/valgrind/test-hmap \
        tests/valgrind/test-json \
@@ -220,10 +219,6 @@ noinst_PROGRAMS += tests/test-hash
 tests_test_hash_SOURCES = tests/test-hash.c
 tests_test_hash_LDADD = lib/libopenvswitch.la
 
-noinst_PROGRAMS += tests/test-heap
-tests_test_heap_SOURCES = tests/test-heap.c
-tests_test_heap_LDADD = lib/libopenvswitch.la
-
 noinst_PROGRAMS += tests/test-hindex
 tests_test_hindex_SOURCES = tests/test-hindex.c
 tests_test_hindex_LDADD = lib/libopenvswitch.la
@@ -300,7 +295,8 @@ tests/idltest.c: tests/idltest.h
 
 noinst_PROGRAMS += tests/ovstest
 tests_ovstest_SOURCES = tests/ovstest.c \
-        tests/ovstest.h
+        tests/ovstest.h \
+        tests/test-heap.c
 tests_ovstest_LDADD = lib/libopenvswitch.la
 
 noinst_PROGRAMS += tests/test-reconnect