X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fautomake.mk;h=bf80702f60b40b3323140b1691acfc101708cce3;hb=HEAD;hp=77281579fa3f59a5c41fd6f6a71d7a60b4aea54d;hpb=0a68ffd2347e96447c5b4751c9e5ac65d5100a56;p=sliver-openvswitch.git diff --git a/tests/automake.mk b/tests/automake.mk index 77281579f..bf80702f6 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -14,11 +14,15 @@ 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/bfd.at \ + tests/cfm.at \ tests/lacp.at \ tests/learn.at \ tests/vconn.at \ @@ -29,10 +33,12 @@ TESTSUITE_AT = \ tests/json.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/vlan-splinters.at \ tests/ofproto-macros.at \ tests/ofproto.at \ tests/ovsdb.at \ @@ -58,11 +64,12 @@ TESTSUITE_AT = \ tests/ovs-xapi-sync.at \ tests/stp.at \ tests/interface-reconfigure.at \ - tests/vlog.at + tests/vlog.at \ + tests/vtep-ctl.at TESTSUITE = $(srcdir)/tests/testsuite DISTCLEANFILES += tests/atconfig tests/atlocal -AUTOTEST_PATH = utilities:vswitchd:ovsdb:tests +AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests check-local: tests/atconfig tests/atlocal $(TESTSUITE) $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS) @@ -73,7 +80,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,75 +89,19 @@ 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 = \ tests/valgrind/ovs-appctl \ tests/valgrind/ovs-ofctl \ + tests/valgrind/ovstest \ tests/valgrind/ovs-vsctl \ tests/valgrind/ovs-vswitchd \ tests/valgrind/ovsdb-client \ tests/valgrind/ovsdb-server \ tests/valgrind/ovsdb-tool \ tests/valgrind/test-aes128 \ + tests/valgrind/test-atomic \ tests/valgrind/test-bundle \ tests/valgrind/test-byte-order \ tests/valgrind/test-classifier \ @@ -158,7 +109,7 @@ valgrind_wrappers = \ tests/valgrind/test-file_name \ 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 \ @@ -172,7 +123,6 @@ valgrind_wrappers = \ 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 \ tests/valgrind/test-uuid \ @@ -188,19 +138,31 @@ 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 + +# Ryu support. +check-ryu: all + srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-ryu +EXTRA_DIST += tests/run-ryu + 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 @@ -217,86 +179,12 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \ } >'$(srcdir)/package.m4' -noinst_PROGRAMS += tests/test-aes128 -tests_test_aes128_SOURCES = tests/test-aes128.c -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 $(SSL_LIBS) - -noinst_PROGRAMS += tests/test-classifier -tests_test_classifier_SOURCES = tests/test-classifier.c -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 $(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 $(SSL_LIBS) - -noinst_PROGRAMS += tests/test-flows -tests_test_flows_SOURCES = tests/test-flows.c -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 $(SSL_LIBS) - -noinst_PROGRAMS += tests/test-json -tests_test_json_SOURCES = tests/test-json.c -tests_test_json_LDADD = lib/libopenvswitch.a $(SSL_LIBS) - -noinst_PROGRAMS += tests/test-jsonrpc -tests_test_jsonrpc_SOURCES = tests/test-jsonrpc.c -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 - -noinst_PROGRAMS += tests/test-lockfile -tests_test_lockfile_SOURCES = tests/test-lockfile.c -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 $(SSL_LIBS) - -noinst_PROGRAMS += tests/test-packets -tests_test_packets_SOURCES = tests/test-packets.c -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 $(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 $(SSL_LIBS) - -noinst_PROGRAMS += tests/test-odp -tests_test_odp_SOURCES = tests/test-odp.c -tests_test_odp_LDADD = lib/libopenvswitch.a $(SSL_LIBS) +noinst_PROGRAMS += tests/test-controller +MAN_ROOTS += tests/test-controller.8.in +DISTCLEANFILES += tests/test-controller.8 +noinst_man_MANS += tests/test-controller.8 +tests_test_controller_SOURCES = tests/test-controller.c +tests_test_controller_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-ovsdb tests_test_ovsdb_SOURCES = \ @@ -304,7 +192,7 @@ tests_test_ovsdb_SOURCES = \ 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) +tests_test_ovsdb_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la # idltest schema and IDL OVSIDL_BUILT += tests/idltest.c tests/idltest.h tests/idltest.ovsidl @@ -316,17 +204,41 @@ tests/idltest.ovsidl: $(IDLTEST_IDL_FILES) 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 $(SSL_LIBS) - -noinst_PROGRAMS += tests/test-sha1 -tests_test_sha1_SOURCES = tests/test-sha1.c -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 $(SSL_LIBS) +noinst_PROGRAMS += tests/ovstest +tests_ovstest_SOURCES = \ + tests/ovstest.c \ + tests/ovstest.h \ + tests/test-aes128.c \ + tests/test-atomic.c \ + tests/test-bundle.c \ + tests/test-byte-order.c \ + tests/test-classifier.c \ + tests/test-csum.c \ + tests/test-file_name.c \ + tests/test-flows.c \ + tests/test-hash.c \ + tests/test-heap.c \ + tests/test-hindex.c \ + tests/test-hmap.c \ + tests/test-json.c \ + tests/test-jsonrpc.c \ + tests/test-list.c \ + tests/test-lockfile.c \ + tests/test-multipath.c \ + tests/test-netflow.c \ + tests/test-odp.c \ + tests/test-packets.c \ + tests/test-random.c \ + tests/test-reconnect.c \ + tests/test-sflow.c \ + tests/test-sha1.c \ + tests/test-stp.c \ + tests/test-unix-socket.c \ + tests/test-util.c \ + tests/test-uuid.c \ + tests/test-vconn.c +tests_ovstest_LDADD = lib/libopenvswitch.la +dist_check_SCRIPTS = tests/flowgen.pl noinst_PROGRAMS += tests/test-strtok_r tests_test_strtok_r_SOURCES = tests/test-strtok_r.c @@ -334,24 +246,6 @@ 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-util -tests_test_util_SOURCES = tests/test-util.c -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 $(SSL_LIBS) - -noinst_PROGRAMS += tests/test-vconn -tests_test_vconn_SOURCES = tests/test-vconn.c -tests_test_vconn_LDADD = lib/libopenvswitch.a $(SSL_LIBS) - -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 +255,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)