X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=9a248feb9d9ad366d7cc735cdbbb9875e3aae99c;hb=ba18611;hp=fe493fd367fadb51b5815ee212b193cfe2de0d52;hpb=c69ee87c10818267f991236201150b1fa51ae519;p=openvswitch

diff --git a/tests/automake.mk b/tests/automake.mk
index fe493fd3..9a248feb 100644
--- 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/classifier.at \
 	tests/check-structs.at \
 	tests/daemon.at \
 	tests/vconn.at \
@@ -33,12 +34,12 @@ TESTSUITE_AT = \
 	tests/ovsdb-transaction.at \
 	tests/ovsdb-execution.at \
 	tests/ovsdb-trigger.at \
-	tests/ovsdb-file.at \
+	tests/ovsdb-tool.at \
 	tests/ovsdb-server.at \
 	tests/ovsdb-monitor.at \
 	tests/ovsdb-idl.at \
-	tests/stp.at \
-	tests/ovs-vsctl.at
+	tests/ovs-vsctl.at \
+	tests/interface-reconfigure.at
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
 
@@ -70,7 +71,6 @@ lcov_wrappers = \
 	tests/lcov/test-ovsdb \
 	tests/lcov/test-reconnect \
 	tests/lcov/test-sha1 \
-	tests/lcov/test-stp \
 	tests/lcov/test-timeval \
 	tests/lcov/test-type-props \
 	tests/lcov/test-uuid \
@@ -90,7 +90,7 @@ LCOV = lcov -b $(abs_top_builddir) -d $(abs_top_builddir) -q
 check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
 	rm -fr tests/coverage.html tests/coverage.info
 	$(LCOV) -c -i -o - > tests/coverage.info
-	$(SHELL) '$(TESTSUITE)' -C tests CHECK_LCOV=true AUTOTEST_PATH='tests/lcov:$(AUTOTEST_PATH)' $(TESTSUITEFLAGS); \
+	$(SHELL) '$(TESTSUITE)' -C tests CHECK_LCOV=true DISABLE_LCOV=false AUTOTEST_PATH='tests/lcov:$(AUTOTEST_PATH)' $(TESTSUITEFLAGS); \
 		rc=$$?; \
 		echo "Producing coverage.html..."; \
 		cd tests && genhtml -q -o coverage.html coverage.info; \
@@ -119,7 +119,6 @@ valgrind_wrappers = \
 	tests/valgrind/test-ovsdb \
 	tests/valgrind/test-reconnect \
 	tests/valgrind/test-sha1 \
-	tests/valgrind/test-stp \
 	tests/valgrind/test-timeval \
 	tests/valgrind/test-type-props \
 	tests/valgrind/test-uuid \
@@ -214,8 +213,8 @@ tests_test_ovsdb_SOURCES = \
 	tests/test-ovsdb.c \
 	tests/idltest.c \
 	tests/idltest.h
-EXTRA_DIST += tests/uuidfilt.pl
-tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS) $(PCRE_LIBS)
+EXTRA_DIST += tests/uuidfilt.pl tests/ovsdb-monitor-sort.pl
+tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
 
 # idltest schema and IDL
 OVSIDL_BUILT +=	tests/idltest.c tests/idltest.h tests/idltest.ovsidl
@@ -249,10 +248,6 @@ noinst_PROGRAMS += tests/test-dhcp-client
 tests_test_dhcp_client_SOURCES = tests/test-dhcp-client.c
 tests_test_dhcp_client_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-uuid
 tests_test_uuid_SOURCES = tests/test-uuid.c
 tests_test_uuid_LDADD = lib/libopenvswitch.a