Merge branch 'master' into next
[sliver-openvswitch.git] / tests / automake.mk
index ee738d1..f862c33 100644 (file)
@@ -6,8 +6,10 @@ EXTRA_DIST += \
        $(srcdir)/tests/testsuite
 TESTSUITE_AT = \
        tests/testsuite.at \
-       tests/lcov-pre.at \
+       tests/ovsdb-macros.at \
        tests/library.at \
+       tests/check-structs.at \
+       tests/daemon.at \
        tests/vconn.at \
        tests/dir_name.at \
        tests/aes128.at \
@@ -35,14 +37,112 @@ TESTSUITE_AT = \
        tests/ovsdb-monitor.at \
        tests/ovsdb-idl.at \
        tests/stp.at \
-       tests/ovs-vsctl.at \
-       tests/lcov-post.at
+       tests/ovs-vsctl.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)
+\f
+# 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
+\f
+# 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 '----------------------------------------------------------------------'
+\f
 clean-local:
        test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
@@ -56,11 +156,11 @@ $(TESTSUITE): package.m4 $(TESTSUITE_AT)
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
        :;{ \
          echo '# Signature of the current package.' && \
-         echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])' && \
-         echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])' && \
-         echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])' && \
-         echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])' && \
-         echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+         echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])' && \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])' && \
+         echo 'm4_define([AT_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])' && \
+         echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])' && \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
        } >'$(srcdir)/package.m4'
 
 noinst_PROGRAMS += tests/test-aes128
@@ -109,15 +209,22 @@ tests_test_lockfile_SOURCES = tests/test-lockfile.c
 tests_test_lockfile_LDADD = lib/libopenvswitch.a
 
 noinst_PROGRAMS += tests/test-ovsdb
-tests_test_ovsdb_SOURCES = tests/test-ovsdb.c tests/idltest.c tests/idltest.h
+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)
-EXTRA_DIST += tests/uuidfilt.pl tests/idltest.ovsidl
-BUILT_SOURCES += tests/idltest.c tests/idltest.h
-noinst_DATA += tests/idltest.ovsschema
-DISTCLEANFILES += tests/idltest.ovsschema
-tests/idltest.c tests/idltest.h tests/idltest.ovsschema: ovsdb/ovsdb-idlc.in
+
+# idltest schema and IDL
+OVSIDL_BUILT +=        tests/idltest.c tests/idltest.h tests/idltest.ovsidl
+IDLTEST_IDL_FILES = tests/idltest.ovsschema tests/idltest.ann
+EXTRA_DIST += $(IDLTEST_IDL_FILES)
+tests/idltest.ovsidl: $(IDLTEST_IDL_FILES)
+       $(OVSDB_IDLC) -C $(srcdir) annotate $(IDLTEST_IDL_FILES) > $@.tmp
+       mv $@.tmp $@
+
 tests/idltest.c: tests/idltest.h
-EXTRA_DIST += tests/idltest.c tests/idltest.h tests/idltest.ovsschema
 
 noinst_PROGRAMS += tests/test-reconnect
 tests_test_reconnect_SOURCES = tests/test-reconnect.c
@@ -131,6 +238,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
 
@@ -152,6 +262,8 @@ tests_test_vconn_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 EXTRA_DIST += \
        tests/testpki-cacert.pem \
        tests/testpki-cert.pem \
+       tests/testpki-cert2.pem \
        tests/testpki-privkey.pem \
-       tests/testpki-req.pem
-
+       tests/testpki-privkey2.pem \
+       tests/testpki-req.pem \
+       tests/testpki-req2.pem