X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=3e42a3ecfac8a0ca6a4b0a4aad867a2016f80d64;hb=e8fa940e4af32f904ff1958a36f95ad4153eac67;hp=eb6351f627675ea7d47ce929350e01e0cc7da79a;hpb=3bffc610fa3ae08fa837f6bd0bf7a2deebdd0970;p=openvswitch diff --git a/tests/automake.mk b/tests/automake.mk index eb6351f6..3e42a3ec 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -8,19 +8,25 @@ TESTSUITE_AT = \ tests/testsuite.at \ tests/ovsdb-macros.at \ tests/library.at \ + tests/heap.at \ tests/bundle.at \ tests/classifier.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 \ tests/autopath.at \ + tests/lacp.at \ + tests/learn.at \ tests/vconn.at \ tests/file_name.at \ tests/aes128.at \ + tests/unixctl-py.at \ tests/uuid.at \ tests/json.at \ tests/jsonrpc.at \ @@ -28,6 +34,7 @@ TESTSUITE_AT = \ tests/timeval.at \ tests/lockfile.at \ tests/reconnect.at \ + tests/ofproto-dpif.at \ tests/ofproto-macros.at \ tests/ofproto.at \ tests/ovsdb.at \ @@ -48,9 +55,12 @@ TESTSUITE_AT = \ tests/ovsdb-server.at \ tests/ovsdb-monitor.at \ tests/ovsdb-idl.at \ - tests/ovsdb-idl-py.at \ tests/ovs-vsctl.at \ - tests/interface-reconfigure.at + tests/ovs-monitor-ipsec.at \ + tests/ovs-xapi-sync.at \ + tests/stp.at \ + tests/interface-reconfigure.at \ + tests/vlog.at TESTSUITE = $(srcdir)/tests/testsuite DISTCLEANFILES += tests/atconfig tests/atlocal @@ -59,11 +69,28 @@ 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 = \ 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 \ @@ -75,6 +102,7 @@ lcov_wrappers = \ 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 \ @@ -87,6 +115,7 @@ lcov_wrappers = \ 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 \ @@ -117,7 +146,9 @@ check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers) valgrind_wrappers = \ tests/valgrind/ovs-appctl \ + tests/valgrind/ovs-ofctl \ tests/valgrind/ovs-vsctl \ + tests/valgrind/ovs-vswitchd \ tests/valgrind/ovsdb-client \ tests/valgrind/ovsdb-server \ tests/valgrind/ovsdb-tool \ @@ -129,6 +160,7 @@ valgrind_wrappers = \ tests/valgrind/test-file_name \ tests/valgrind/test-flows \ tests/valgrind/test-hash \ + tests/valgrind/test-heap \ tests/valgrind/test-hmap \ tests/valgrind/test-json \ tests/valgrind/test-jsonrpc \ @@ -136,12 +168,12 @@ valgrind_wrappers = \ tests/valgrind/test-lockfile \ tests/valgrind/test-multipath \ tests/valgrind/test-odp \ - tests/valgrind/test-openflowd \ tests/valgrind/test-ovsdb \ tests/valgrind/test-packets \ tests/valgrind/test-random \ tests/valgrind/test-reconnect \ tests/valgrind/test-sha1 \ + tests/valgrind/test-stp \ tests/valgrind/test-timeval \ tests/valgrind/test-type-props \ tests/valgrind/test-unix-socket \ @@ -158,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 '----------------------------------------------------------------------' @@ -189,40 +223,44 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac noinst_PROGRAMS += tests/test-aes128 tests_test_aes128_SOURCES = tests/test-aes128.c -tests_test_aes128_LDADD = lib/libopenvswitch.a +tests_test_aes128_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-bundle tests_test_bundle_SOURCES = tests/test-bundle.c -tests_test_bundle_LDADD = lib/libopenvswitch.a +tests_test_bundle_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-classifier tests_test_classifier_SOURCES = tests/test-classifier.c -tests_test_classifier_LDADD = lib/libopenvswitch.a +tests_test_classifier_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-csum tests_test_csum_SOURCES = tests/test-csum.c -tests_test_csum_LDADD = lib/libopenvswitch.a +tests_test_csum_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-file_name tests_test_file_name_SOURCES = tests/test-file_name.c -tests_test_file_name_LDADD = lib/libopenvswitch.a +tests_test_file_name_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-flows tests_test_flows_SOURCES = tests/test-flows.c -tests_test_flows_LDADD = lib/libopenvswitch.a +tests_test_flows_LDADD = lib/libopenvswitch.a $(SSL_LIBS) dist_check_SCRIPTS = tests/flowgen.pl noinst_PROGRAMS += tests/test-hash tests_test_hash_SOURCES = tests/test-hash.c tests_test_hash_LDADD = lib/libopenvswitch.a +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-hmap tests_test_hmap_SOURCES = tests/test-hmap.c -tests_test_hmap_LDADD = lib/libopenvswitch.a +tests_test_hmap_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-json tests_test_json_SOURCES = tests/test-json.c -tests_test_json_LDADD = lib/libopenvswitch.a +tests_test_json_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-jsonrpc tests_test_jsonrpc_SOURCES = tests/test-jsonrpc.c @@ -234,39 +272,35 @@ tests_test_list_LDADD = lib/libopenvswitch.a noinst_PROGRAMS += tests/test-lockfile tests_test_lockfile_SOURCES = tests/test-lockfile.c -tests_test_lockfile_LDADD = lib/libopenvswitch.a +tests_test_lockfile_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-multipath tests_test_multipath_SOURCES = tests/test-multipath.c -tests_test_multipath_LDADD = lib/libopenvswitch.a - -noinst_PROGRAMS += tests/test-openflowd -EXTRA_DIST += tests/test-openflowd.8.in -DISTCLEANFILES += tests/test-openflowd.8 -noinst_man_MANS += tests/ovs-openflowd.8 -tests_test_openflowd_SOURCES = tests/test-openflowd.c -tests_test_openflowd_LDADD = \ - ofproto/libofproto.a \ - lib/libsflow.a \ - lib/libopenvswitch.a \ - $(SSL_LIBS) - +tests_test_multipath_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-packets tests_test_packets_SOURCES = tests/test-packets.c -tests_test_packets_LDADD = lib/libopenvswitch.a +tests_test_packets_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-random tests_test_random_SOURCES = tests/test-random.c -tests_test_random_LDADD = lib/libopenvswitch.a +tests_test_random_LDADD = lib/libopenvswitch.a $(SSL_LIBS) + +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-netflow +tests_test_netflow_SOURCES = tests/test-netflow.c +tests_test_netflow_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-unix-socket tests_test_unix_socket_SOURCES = tests/test-unix-socket.c -tests_test_unix_socket_LDADD = lib/libopenvswitch.a +tests_test_unix_socket_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-odp tests_test_odp_SOURCES = tests/test-odp.c -tests_test_odp_LDADD = lib/libopenvswitch.a +tests_test_odp_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-ovsdb tests_test_ovsdb_SOURCES = \ @@ -277,7 +311,7 @@ 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 +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) @@ -288,15 +322,15 @@ tests/idltest.c: tests/idltest.h noinst_PROGRAMS += tests/test-reconnect tests_test_reconnect_SOURCES = tests/test-reconnect.c -tests_test_reconnect_LDADD = lib/libopenvswitch.a +tests_test_reconnect_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-sha1 tests_test_sha1_SOURCES = tests/test-sha1.c -tests_test_sha1_LDADD = lib/libopenvswitch.a +tests_test_sha1_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-timeval tests_test_timeval_SOURCES = tests/test-timeval.c -tests_test_timeval_LDADD = lib/libopenvswitch.a +tests_test_timeval_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-strtok_r tests_test_strtok_r_SOURCES = tests/test-strtok_r.c @@ -306,11 +340,11 @@ tests_test_type_props_SOURCES = tests/test-type-props.c noinst_PROGRAMS += tests/test-util tests_test_util_SOURCES = tests/test-util.c -tests_test_util_LDADD = lib/libopenvswitch.a +tests_test_util_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-uuid tests_test_uuid_SOURCES = tests/test-uuid.c -tests_test_uuid_LDADD = lib/libopenvswitch.a +tests_test_uuid_LDADD = lib/libopenvswitch.a $(SSL_LIBS) noinst_PROGRAMS += tests/test-vconn tests_test_vconn_SOURCES = tests/test-vconn.c @@ -320,13 +354,21 @@ 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. -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/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 = \