X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fautomake.mk;h=1af41ccb7d468bd488329da877cc032c60a25d38;hb=822b7f52108e1936f68fe2f726d0796df1b19903;hp=77281579fa3f59a5c41fd6f6a71d7a60b4aea54d;hpb=0a68ffd2347e96447c5b4751c9e5ac65d5100a56;p=sliver-openvswitch.git diff --git a/tests/automake.mk b/tests/automake.mk index 77281579f..1af41ccb7 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -14,11 +14,13 @@ TESTSUITE_AT = \ tests/check-structs.at \ tests/daemon.at \ tests/daemon-py.at \ + tests/ofp-actions.at \ tests/ofp-print.at \ + tests/ofp-util.at \ + tests/ofp-errors.at \ tests/ovs-ofctl.at \ tests/odp.at \ tests/multipath.at \ - tests/autopath.at \ tests/lacp.at \ tests/learn.at \ tests/vconn.at \ @@ -30,8 +32,10 @@ TESTSUITE_AT = \ tests/jsonrpc.at \ tests/jsonrpc-py.at \ tests/timeval.at \ + tests/tunnel.at \ tests/lockfile.at \ tests/reconnect.at \ + tests/ovs-vswitchd.at \ tests/ofproto-dpif.at \ tests/ofproto-macros.at \ tests/ofproto.at \ @@ -73,7 +77,7 @@ check-local: tests/atconfig tests/atlocal $(TESTSUITE) COVERAGE = coverage COVERAGE_FILE='$(abs_srcdir)/.coverage' check-pycov: all tests/atconfig tests/atlocal $(TESTSUITE) clean-pycov - COVERAGE_FILE=$(COVERAGE_FILE) PYTHON='$(COVERAGE) run -p' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS) + 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 '----------------------------------------------------------------------' @@ -82,64 +86,6 @@ check-pycov: all tests/atconfig tests/atlocal $(TESTSUITE) clean-pycov @echo @COVERAGE_FILE=$(COVERAGE_FILE) $(COVERAGE) report -# lcov support - -lcov_wrappers = \ - tests/lcov/ovs-appctl \ - tests/lcov/ovs-ofctl \ - tests/lcov/ovs-vsctl \ - tests/lcov/ovs-vswitchd \ - tests/lcov/ovsdb-client \ - tests/lcov/ovsdb-server \ - tests/lcov/ovsdb-tool \ - tests/lcov/test-aes128 \ - tests/lcov/test-bundle \ - tests/lcov/test-byte-order \ - tests/lcov/test-classifier \ - tests/lcov/test-csum \ - tests/lcov/test-file_name \ - tests/lcov/test-flows \ - tests/lcov/test-hash \ - tests/lcov/test-heap \ - tests/lcov/test-hmap \ - tests/lcov/test-json \ - tests/lcov/test-jsonrpc \ - tests/lcov/test-list \ - tests/lcov/test-lockfile \ - tests/lcov/test-multipath \ - tests/lcov/test-odp \ - tests/lcov/test-ovsdb \ - tests/lcov/test-packets \ - tests/lcov/test-random \ - tests/lcov/test-reconnect \ - tests/lcov/test-sha1 \ - tests/lcov/test-stp \ - tests/lcov/test-timeval \ - tests/lcov/test-type-props \ - tests/lcov/test-unix-socket \ - 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 DISABLE_LCOV=false 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 = \ @@ -159,6 +105,7 @@ valgrind_wrappers = \ tests/valgrind/test-flows \ tests/valgrind/test-hash \ tests/valgrind/test-heap \ + tests/valgrind/test-hindex \ tests/valgrind/test-hmap \ tests/valgrind/test-json \ tests/valgrind/test-jsonrpc \ @@ -188,19 +135,26 @@ 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 '----------------------------------------------------------------------' @echo 'Valgrind output can be found in tests/testsuite.dir/*/valgrind.*' @echo '----------------------------------------------------------------------' +# OFTest support. + +check-oftest: all + srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-oftest +EXTRA_DIST += tests/run-oftest + clean-local: test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean -AUTOM4TE = autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): package.m4 $(TESTSUITE_AT) $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at @@ -250,6 +204,10 @@ noinst_PROGRAMS += tests/test-heap tests_test_heap_SOURCES = tests/test-heap.c tests_test_heap_LDADD = lib/libopenvswitch.a $(SSL_LIBS) +noinst_PROGRAMS += tests/test-hindex +tests_test_hindex_SOURCES = tests/test-hindex.c +tests_test_hindex_LDADD = lib/libopenvswitch.a $(SSL_LIBS) + noinst_PROGRAMS += tests/test-hmap tests_test_hmap_SOURCES = tests/test-hmap.c tests_test_hmap_LDADD = lib/libopenvswitch.a $(SSL_LIBS) @@ -264,7 +222,7 @@ tests_test_jsonrpc_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-list tests_test_list_SOURCES = tests/test-list.c -tests_test_list_LDADD = lib/libopenvswitch.a +tests_test_list_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-lockfile tests_test_lockfile_SOURCES = tests/test-lockfile.c @@ -286,6 +244,10 @@ noinst_PROGRAMS += tests/test-stp tests_test_stp_SOURCES = tests/test-stp.c tests_test_stp_LDADD = lib/libopenvswitch.a $(SSL_LIBS) +noinst_PROGRAMS += tests/test-sflow +tests_test_sflow_SOURCES = tests/test-sflow.c +tests_test_sflow_LDADD = lib/libopenvswitch.a $(SSL_LIBS) + noinst_PROGRAMS += tests/test-netflow tests_test_netflow_SOURCES = tests/test-netflow.c tests_test_netflow_LDADD = lib/libopenvswitch.a $(SSL_LIBS) @@ -350,8 +312,6 @@ noinst_PROGRAMS += tests/test-byte-order tests_test_byte_order_SOURCES = tests/test-byte-order.c tests_test_byte_order_LDADD = lib/libopenvswitch.a -EXTRA_DIST += tests/choose-port.pl - # Python tests. CHECK_PYFILES = \ tests/appctl.py \ @@ -361,6 +321,7 @@ CHECK_PYFILES = \ tests/test-ovsdb.py \ tests/test-reconnect.py \ tests/MockXenAPI.py \ + tests/test-unix-socket.py \ tests/test-unixctl.py \ tests/test-vlog.py EXTRA_DIST += $(CHECK_PYFILES)