X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=ebf2a018c438f8791471d5725e7cfa157035e8b0;hb=55e199190427d962831486b5cec0d1723519a197;hp=4a48496bd27b5b721030aeb6a52a1d91c4777d73;hpb=7c126fbb8a0589f2a29f3e7c520723a2d74b254e;p=openvswitch

diff --git a/tests/automake.mk b/tests/automake.mk
index 4a48496b..ebf2a018 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -26,18 +26,20 @@ 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/ovs-vsctl.at \
+	tests/interface-reconfigure.at
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
 
@@ -95,6 +97,54 @@ check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
 		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
 
@@ -165,7 +215,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
@@ -190,6 +240,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