X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=51205d9b86a07b9933262e2a468055a91afeabc3;hb=10d3515aa4fc0d338df28d2760fae264c0cea40a;hp=e1738f6991872e5dc6f960cbb0140e08da457b51;hpb=00732bf5b5da6f1d71dc4f4b42f54224c03f71f6;p=openvswitch

diff --git a/tests/automake.mk b/tests/automake.mk
index e1738f69..51205d9b 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -7,8 +7,8 @@ EXTRA_DIST += \
 TESTSUITE_AT = \
 	tests/testsuite.at \
 	tests/ovsdb-macros.at \
-	tests/lcov-pre.at \
 	tests/library.at \
+	tests/classifier.at \
 	tests/check-structs.at \
 	tests/daemon.at \
 	tests/vconn.at \
@@ -27,25 +27,125 @@ TESTSUITE_AT = \
 	tests/ovsdb-column.at \
 	tests/ovsdb-table.at \
 	tests/ovsdb-row.at \
+	tests/ovsdb-schema.at \
 	tests/ovsdb-condition.at \
 	tests/ovsdb-mutation.at \
 	tests/ovsdb-query.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/lcov-post.at
+	tests/interface-reconfigure.at
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
 
+AUTOTEST_PATH = utilities:vswitchd:ovsdb:tests
+
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
-	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH='utilities:vswitchd:ovsdb:tests' $(TESTSUITEFLAGS)
+	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
+
+# lcov support
+
+lcov_wrappers = \
+	tests/lcov/ovs-appctl \
+	tests/lcov/ovs-vsctl \
+	tests/lcov/ovsdb-client \
+	tests/lcov/ovsdb-server \
+	tests/lcov/ovsdb-tool \
+	tests/lcov/test-aes128 \
+	tests/lcov/test-classifier \
+	tests/lcov/test-csum \
+	tests/lcov/test-dhcp-client \
+	tests/lcov/test-dir_name \
+	tests/lcov/test-flows \
+	tests/lcov/test-hash \
+	tests/lcov/test-hmap \
+	tests/lcov/test-json \
+	tests/lcov/test-jsonrpc \
+	tests/lcov/test-list \
+	tests/lcov/test-lockfile \
+	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 \
+	tests/lcov/test-vconn
+
+$(lcov_wrappers): tests/lcov-wrapper.in
+	@test -d tests/lcov || mkdir tests/lcov
+	sed -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),' \
+	    -e 's,[@]wrap_program[@],$@,' \
+		$(top_srcdir)/tests/lcov-wrapper.in > $@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
+CLEANFILES += $(lcov_wrappers)
+EXTRA_DIST += tests/lcov-wrapper.in
+
+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); \
+		rc=$$?; \
+		echo "Producing coverage.html..."; \
+		cd tests && genhtml -q -o coverage.html coverage.info; \
+		exit $$rc
+
+# valgrind support
 
+valgrind_wrappers = \
+	tests/valgrind/ovs-appctl \
+	tests/valgrind/ovs-vsctl \
+	tests/valgrind/ovsdb-client \
+	tests/valgrind/ovsdb-server \
+	tests/valgrind/ovsdb-tool \
+	tests/valgrind/test-aes128 \
+	tests/valgrind/test-classifier \
+	tests/valgrind/test-csum \
+	tests/valgrind/test-dhcp-client \
+	tests/valgrind/test-dir_name \
+	tests/valgrind/test-flows \
+	tests/valgrind/test-hash \
+	tests/valgrind/test-hmap \
+	tests/valgrind/test-json \
+	tests/valgrind/test-jsonrpc \
+	tests/valgrind/test-list \
+	tests/valgrind/test-lockfile \
+	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 \
+	tests/valgrind/test-vconn
+
+$(valgrind_wrappers): tests/valgrind-wrapper.in
+	@test -d tests/valgrind || mkdir tests/valgrind
+	sed -e 's,[@]wrap_program[@],$@,' \
+		$(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
+CLEANFILES += $(valgrind_wrappers)
+EXTRA_DIST += tests/valgrind-wrapper.in
+
+VALGRIND = valgrind --log-file=valgrind.%p --leak-check=full \
+	--suppressions=$(abs_top_srcdir)/tests/openssl.supp --num-callers=20
+EXTRA_DIST += tests/openssl.supp
+check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) $(valgrind_wrappers)
+	$(SHELL) '$(TESTSUITE)' -C tests CHECK_VALGRIND=true VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
+	@echo
+	@echo '----------------------------------------------------------------------'
+	@echo 'Valgrind output can be found in tests/testsuite.dir/*/valgrind.*'
+	@echo '----------------------------------------------------------------------'
+
 clean-local:
 	test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
@@ -116,7 +216,7 @@ tests_test_ovsdb_SOURCES = \
 	tests/test-ovsdb.c \
 	tests/idltest.c \
 	tests/idltest.h
-EXTRA_DIST += tests/uuidfilt.pl
+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
@@ -141,6 +241,9 @@ noinst_PROGRAMS += tests/test-timeval
 tests_test_timeval_SOURCES = tests/test-timeval.c
 tests_test_timeval_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-strtok_r
+tests_test_strtok_r_SOURCES = tests/test-strtok_r.c
+
 noinst_PROGRAMS += tests/test-type-props
 tests_test_type_props_SOURCES = tests/test-type-props.c