X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=3e42a3ecfac8a0ca6a4b0a4aad867a2016f80d64;hb=0c449c5683a64592215c3bcc051437bd7bffffa3;hp=b133467c9613ab4b34d813e373d686ebfde71795;hpb=bde9f75de100e3801735bf69f605320f4db65cba;p=openvswitch

diff --git a/tests/automake.mk b/tests/automake.mk
index b133467c..3e42a3ec 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -14,7 +14,9 @@ TESTSUITE_AT = \
 	tests/check-structs.at \
 	tests/daemon.at \
 	tests/daemon-py.at \
+	tests/ofp-actions.at \
 	tests/ofp-print.at \
+	tests/ofp-errors.at \
 	tests/ovs-ofctl.at \
 	tests/odp.at \
 	tests/multipath.at \
@@ -24,6 +26,7 @@ TESTSUITE_AT = \
 	tests/vconn.at \
 	tests/file_name.at \
 	tests/aes128.at \
+	tests/unixctl-py.at \
 	tests/uuid.at \
 	tests/json.at \
 	tests/jsonrpc.at \
@@ -66,6 +69,21 @@ AUTOTEST_PATH = utilities:vswitchd:ovsdb:tests
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
 
+# Python Coverage support.
+# Requires coverage.py http://nedbatchelder.com/code/coverage/.
+
+COVERAGE = coverage
+COVERAGE_FILE='$(abs_srcdir)/.coverage'
+check-pycov: all tests/atconfig tests/atlocal $(TESTSUITE) clean-pycov
+	PYTHONDONTWRITEBYTECODE=yes COVERAGE_FILE=$(COVERAGE_FILE) PYTHON='$(COVERAGE) run -p' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
+	@cd $(srcdir) && $(COVERAGE) combine && COVERAGE_FILE=$(COVERAGE_FILE) $(COVERAGE) annotate
+	@echo
+	@echo '----------------------------------------------------------------------'
+	@echo 'Annotated coverage source has the ",cover" extension.'
+	@echo '----------------------------------------------------------------------'
+	@echo
+	@COVERAGE_FILE=$(COVERAGE_FILE) $(COVERAGE) report
+
 # lcov support
 
 lcov_wrappers = \
@@ -172,9 +190,11 @@ CLEANFILES += $(valgrind_wrappers)
 EXTRA_DIST += tests/valgrind-wrapper.in
 
 VALGRIND = valgrind --log-file=valgrind.%p --leak-check=full \
+	--suppressions=$(abs_top_srcdir)/tests/glibc.supp \
 	--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)
+EXTRA_DIST += tests/glibc.supp tests/openssl.supp
+check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) \
+                $(valgrind_wrappers) $(check_DATA)
 	$(SHELL) '$(TESTSUITE)' -C tests CHECK_VALGRIND=true VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
 	@echo
 	@echo '----------------------------------------------------------------------'
@@ -337,14 +357,18 @@ tests_test_byte_order_LDADD = lib/libopenvswitch.a
 EXTRA_DIST += tests/choose-port.pl
 
 # Python tests.
-EXTRA_DIST += \
+CHECK_PYFILES = \
+	tests/appctl.py \
 	tests/test-daemon.py \
 	tests/test-json.py \
 	tests/test-jsonrpc.py \
 	tests/test-ovsdb.py \
 	tests/test-reconnect.py \
 	tests/MockXenAPI.py \
+	tests/test-unixctl.py \
 	tests/test-vlog.py
+EXTRA_DIST += $(CHECK_PYFILES)
+PYCOV_CLEAN_FILES += $(CHECK_PYFILES:.py=.py,cover) .coverage
 
 if HAVE_OPENSSL
 TESTPKI_FILES = \