X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fautomake.mk;h=ebf2a018c438f8791471d5725e7cfa157035e8b0;hb=f39dc942afd5fe241903aada30850a1d96122c8c;hp=93b187e93c7464036f068f4c91fbad5eaf58ad44;hpb=75c7fd6c824da2700b494e7e228b88d172f78be3;p=sliver-openvswitch.git diff --git a/tests/automake.mk b/tests/automake.mk index 93b187e93..ebf2a018c 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -6,8 +6,11 @@ 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 \ tests/uuid.at \ @@ -23,24 +26,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 @@ -54,11 +158,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 @@ -96,7 +200,7 @@ tests_test_json_LDADD = lib/libopenvswitch.a noinst_PROGRAMS += tests/test-jsonrpc tests_test_jsonrpc_SOURCES = tests/test-jsonrpc.c -tests_test_jsonrpc_LDADD = lib/libopenvswitch.a +tests_test_jsonrpc_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-list tests_test_list_SOURCES = tests/test-list.c @@ -107,13 +211,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_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a -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 +tests_test_ovsdb_SOURCES = \ + tests/test-ovsdb.c \ + tests/idltest.c \ + tests/idltest.h +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 +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 noinst_PROGRAMS += tests/test-reconnect tests_test_reconnect_SOURCES = tests/test-reconnect.c @@ -127,12 +240,15 @@ 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 noinst_PROGRAMS += tests/test-dhcp-client tests_test_dhcp_client_SOURCES = tests/test-dhcp-client.c -tests_test_dhcp_client_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) +tests_test_dhcp_client_LDADD = lib/libopenvswitch.a noinst_PROGRAMS += tests/test-stp tests_test_stp_SOURCES = tests/test-stp.c @@ -145,4 +261,11 @@ tests_test_uuid_LDADD = lib/libopenvswitch.a noinst_PROGRAMS += tests/test-vconn tests_test_vconn_SOURCES = tests/test-vconn.c 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-privkey2.pem \ + tests/testpki-req.pem \ + tests/testpki-req2.pem