X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=f9c0de0edd28a0c71ff7ede41469e441c2204a0a;hb=09246b99d1601e2ba7ff85bb26f9b0235632a76d;hp=e5cd0ec2f8145e7a51bcda673c1a7aade34f79ff;hpb=48d014bff2b896b3a9d8937d26facad9a54d5a1a;p=openvswitch

diff --git a/tests/automake.mk b/tests/automake.mk
index e5cd0ec2..f9c0de0e 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -8,14 +8,18 @@ TESTSUITE_AT = \
 	tests/testsuite.at \
 	tests/ovsdb-macros.at \
 	tests/library.at \
+	tests/classifier.at \
 	tests/check-structs.at \
 	tests/daemon.at \
+	tests/daemon-py.at \
+	tests/ovs-ofctl.at \
 	tests/vconn.at \
 	tests/dir_name.at \
 	tests/aes128.at \
 	tests/uuid.at \
 	tests/json.at \
 	tests/jsonrpc.at \
+	tests/jsonrpc-py.at \
 	tests/timeval.at \
 	tests/lockfile.at \
 	tests/reconnect.at \
@@ -37,7 +41,7 @@ TESTSUITE_AT = \
 	tests/ovsdb-server.at \
 	tests/ovsdb-monitor.at \
 	tests/ovsdb-idl.at \
-	tests/stp.at \
+	tests/ovsdb-idl-py.at \
 	tests/ovs-vsctl.at \
 	tests/interface-reconfigure.at
 TESTSUITE = $(srcdir)/tests/testsuite
@@ -57,6 +61,7 @@ lcov_wrappers = \
 	tests/lcov/ovsdb-server \
 	tests/lcov/ovsdb-tool \
 	tests/lcov/test-aes128 \
+	tests/lcov/test-byte-order \
 	tests/lcov/test-classifier \
 	tests/lcov/test-csum \
 	tests/lcov/test-dhcp-client \
@@ -71,7 +76,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 \
@@ -91,7 +95,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; \
@@ -106,6 +110,7 @@ valgrind_wrappers = \
 	tests/valgrind/ovsdb-server \
 	tests/valgrind/ovsdb-tool \
 	tests/valgrind/test-aes128 \
+	tests/valgrind/test-byte-order \
 	tests/valgrind/test-classifier \
 	tests/valgrind/test-csum \
 	tests/valgrind/test-dhcp-client \
@@ -120,7 +125,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 \
@@ -215,8 +219,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
@@ -250,10 +254,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
@@ -269,3 +269,15 @@ EXTRA_DIST += \
 	tests/testpki-privkey2.pem \
 	tests/testpki-req.pem \
 	tests/testpki-req2.pem
+
+noinst_PROGRAMS += tests/test-byte-order
+tests_test_byte_order_SOURCES = tests/test-byte-order.c
+tests_test_byte_order_LDADD = lib/libopenvswitch.a
+
+# Python tests.
+EXTRA_DIST += \
+	tests/test-daemon.py \
+	tests/test-json.py \
+	tests/test-jsonrpc.py \
+	tests/test-ovsdb.py \
+	tests/test-reconnect.py