EXTRA_DIST += \
+ $(COMMON_MACROS_AT) \
$(TESTSUITE_AT) \
+ $(KMOD_TESTSUITE_AT) \
$(TESTSUITE) \
+ $(KMOD_TESTSUITE) \
tests/atlocal.in \
$(srcdir)/package.m4 \
- $(srcdir)/tests/testsuite
+ $(srcdir)/tests/testsuite \
+ $(srcdir)/tests/testsuite.patch
+
+COMMON_MACROS_AT = \
+ tests/ovsdb-macros.at \
+ tests/ovs-macros.at \
+ tests/ofproto-macros.at
+
TESTSUITE_AT = \
tests/testsuite.at \
- tests/ovsdb-macros.at \
+ tests/completion.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-util.at \
+ tests/ofp-errors.at \
tests/ovs-ofctl.at \
tests/odp.at \
+ tests/mpls-xlate.at \
tests/multipath.at \
- tests/autopath.at \
+ tests/bfd.at \
+ tests/cfm.at \
tests/lacp.at \
+ tests/lib.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 \
tests/jsonrpc-py.at \
- tests/timeval.at \
+ tests/tunnel.at \
+ tests/tunnel-push-pop.at \
tests/lockfile.at \
tests/reconnect.at \
+ tests/ovs-vswitchd.at \
+ tests/dpif-netdev.at \
+ tests/dpctl.at \
tests/ofproto-dpif.at \
- tests/ofproto-macros.at \
+ tests/bridge.at \
+ tests/vlan-splinters.at \
tests/ofproto.at \
tests/ovsdb.at \
tests/ovsdb-log.at \
tests/ovs-monitor-ipsec.at \
tests/ovs-xapi-sync.at \
tests/stp.at \
+ tests/rstp.at \
tests/interface-reconfigure.at \
- tests/vlog.at
+ tests/vlog.at \
+ tests/vtep-ctl.at \
+ tests/auto-attach.at \
+ tests/ovn.at
+
+KMOD_TESTSUITE_AT = \
+ tests/kmod-testsuite.at \
+ tests/kmod-macros.at \
+ tests/kmod-traffic.at
+
TESTSUITE = $(srcdir)/tests/testsuite
+TESTSUITE_PATCH = $(srcdir)/tests/testsuite.patch
+KMOD_TESTSUITE = $(srcdir)/tests/kmod-testsuite
DISTCLEANFILES += tests/atconfig tests/atlocal
-AUTOTEST_PATH = utilities:vswitchd:ovsdb:tests
+AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests:$(PTHREAD_WIN32_DIR_DLL)
check-local: tests/atconfig tests/atlocal $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
\f
-# lcov support
-
-lcov_wrappers = \
- tests/lcov/ovs-appctl \
- 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-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
+# 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
\f
# 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 \
+ tests/valgrind/test-cmap \
tests/valgrind/test-csum \
- tests/valgrind/test-file_name \
tests/valgrind/test-flows \
tests/valgrind/test-hash \
+ tests/valgrind/test-hindex \
tests/valgrind/test-hmap \
tests/valgrind/test-json \
tests/valgrind/test-jsonrpc \
tests/valgrind/test-lockfile \
tests/valgrind/test-multipath \
tests/valgrind/test-odp \
+ tests/valgrind/test-ofpbuf \
tests/valgrind/test-ovsdb \
tests/valgrind/test-packets \
tests/valgrind/test-random \
tests/valgrind/test-reconnect \
+ tests/valgrind/test-rstp \
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 \
$(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
+ $(AM_V_GEN) 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/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 '----------------------------------------------------------------------'
\f
+# OFTest support.
+
+check-oftest: all
+ $(AM_V_at)srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-oftest
+EXTRA_DIST += tests/run-oftest
+
+# Ryu support.
+check-ryu: all
+ $(AM_V_at)srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-ryu
+EXTRA_DIST += tests/run-ryu
+\f
+# Run kmod tests. Assume kernel modules has been installed or linked into the kernel
+check-kernel: all tests/atconfig tests/atlocal $(KMOD_TESTSUITE)
+ $(SHELL) '$(KMOD_TESTSUITE)' -C tests AUTOTEST_PATH='$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
+
+# Testing the out of tree Kernel module
+check-kmod: all tests/atconfig tests/atlocal $(KMOD_TESTSUITE)
+ $(MAKE) modules_install
+ modprobe -r openvswitch
+ $(MAKE) check-kernel
+
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
- mv $@.tmp $@
+
+if WIN32
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT) $(TESTSUITE_PATCH)
+ $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o testsuite.tmp $@.at
+ patch -p0 testsuite.tmp $(TESTSUITE_PATCH)
+ $(AM_V_at)mv testsuite.tmp $@
+else
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT)
+ $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+ $(AM_V_at)mv $@.tmp $@
+endif
+
+$(KMOD_TESTSUITE): package.m4 $(KMOD_TESTSUITE_AT) $(COMMON_MACROS_AT)
+ $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+ $(AM_V_at)mv $@.tmp $@
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
- :;{ \
+ $(AM_V_GEN):;{ \
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_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
-
-noinst_PROGRAMS += tests/test-bundle
-tests_test_bundle_SOURCES = tests/test-bundle.c
-tests_test_bundle_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-classifier
-tests_test_classifier_SOURCES = tests/test-classifier.c
-tests_test_classifier_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-csum
-tests_test_csum_SOURCES = tests/test-csum.c
-tests_test_csum_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-file_name
-tests_test_file_name_SOURCES = tests/test-file_name.c
-tests_test_file_name_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-flows
-tests_test_flows_SOURCES = tests/test-flows.c
-tests_test_flows_LDADD = lib/libopenvswitch.a
-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-hmap
-tests_test_hmap_SOURCES = tests/test-hmap.c
-tests_test_hmap_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-json
-tests_test_json_SOURCES = tests/test-json.c
-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 $(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
-
-noinst_PROGRAMS += tests/test-multipath
-tests_test_multipath_SOURCES = tests/test-multipath.c
-tests_test_multipath_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-packets
-tests_test_packets_SOURCES = tests/test-packets.c
-tests_test_packets_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-random
-tests_test_random_SOURCES = tests/test-random.c
-tests_test_random_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-stp
-tests_test_stp_SOURCES = tests/test-stp.c
-tests_test_stp_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-unix-socket
-tests_test_unix_socket_SOURCES = tests/test-unix-socket.c
-tests_test_unix_socket_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-odp
-tests_test_odp_SOURCES = tests/test-odp.c
-tests_test_odp_LDADD = lib/libopenvswitch.a
-
noinst_PROGRAMS += tests/test-ovsdb
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)
+tests_test_ovsdb_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
+
+noinst_PROGRAMS += tests/test-lib
+tests_test_lib_SOURCES = \
+ tests/test-lib.c
+tests_test_lib_LDADD = lib/libopenvswitch.la
# 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)
+EXTRA_DIST += $(IDLTEST_IDL_FILES) tests/idltest2.ovsschema
tests/idltest.ovsidl: $(IDLTEST_IDL_FILES)
- $(OVSDB_IDLC) -C $(srcdir) annotate $(IDLTEST_IDL_FILES) > $@.tmp
+ $(AM_V_GEN)$(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
-tests_test_reconnect_LDADD = lib/libopenvswitch.a
+if DPDK_NETDEV
+noinst_PROGRAMS += tests/test-dpdkr
+tests_test_dpdkr_SOURCES = \
+ tests/dpdk/ring_client.c
+tests_test_dpdkr_LDADD = lib/libopenvswitch.la $(LIBS)
+endif
-noinst_PROGRAMS += tests/test-sha1
-tests_test_sha1_SOURCES = tests/test-sha1.c
-tests_test_sha1_LDADD = lib/libopenvswitch.a
+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-cmap.c \
+ tests/test-csum.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-ofpbuf.c \
+ tests/test-ovn.c \
+ tests/test-packets.c \
+ tests/test-random.c \
+ tests/test-reconnect.c \
+ tests/test-rstp.c \
+ tests/test-sflow.c \
+ tests/test-sha1.c \
+ tests/test-stp.c \
+ tests/test-util.c \
+ tests/test-uuid.c \
+ tests/test-bitmap.c \
+ tests/test-vconn.c \
+ tests/test-aa.c
+
+if !WIN32
+tests_ovstest_SOURCES += \
+ tests/test-unix-socket.c
+endif
-noinst_PROGRAMS += tests/test-timeval
-tests_test_timeval_SOURCES = tests/test-timeval.c
-tests_test_timeval_LDADD = lib/libopenvswitch.a
+tests_ovstest_LDADD = lib/libopenvswitch.la ovn/lib/libovn.la
+dist_check_SCRIPTS = tests/flowgen.pl
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-util
-tests_test_util_SOURCES = tests/test-util.c
-tests_test_util_LDADD = lib/libopenvswitch.a
-
-noinst_PROGRAMS += tests/test-uuid
-tests_test_uuid_SOURCES = tests/test-uuid.c
-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)
-
-noinst_PROGRAMS += tests/test-byte-order
-tests_test_byte_order_SOURCES = tests/test-byte-order.c
-tests_test_byte_order_LDADD = lib/libopenvswitch.a
-
# 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/MockXenAPI.py \
+ tests/test-unix-socket.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 = \
check_DATA += $(TESTPKI_FILES)
CLEANFILES += $(TESTPKI_FILES)
-tests/testpki-cacert.pem: tests/pki/stamp; cp tests/pki/switchca/cacert.pem $@
-tests/testpki-cert.pem: tests/pki/stamp; cp tests/pki/test-cert.pem $@
-tests/testpki-req.pem: tests/pki/stamp; cp tests/pki/test-req.pem $@
-tests/testpki-privkey.pem: tests/pki/stamp; cp tests/pki/test-privkey.pem $@
-tests/testpki-cert2.pem: tests/pki/stamp; cp tests/pki/test2-cert.pem $@
-tests/testpki-req2.pem: tests/pki/stamp; cp tests/pki/test2-req.pem $@
-tests/testpki-privkey2.pem: tests/pki/stamp; cp tests/pki/test2-privkey.pem $@
+tests/testpki-cacert.pem: tests/pki/stamp
+ $(AM_V_GEN)cp tests/pki/switchca/cacert.pem $@
+tests/testpki-cert.pem: tests/pki/stamp
+ $(AM_V_GEN)cp tests/pki/test-cert.pem $@
+tests/testpki-req.pem: tests/pki/stamp
+ $(AM_V_GEN)cp tests/pki/test-req.pem $@
+tests/testpki-privkey.pem: tests/pki/stamp
+ $(AM_V_GEN)cp tests/pki/test-privkey.pem $@
+tests/testpki-cert2.pem: tests/pki/stamp
+ $(AM_V_GEN)cp tests/pki/test2-cert.pem $@
+tests/testpki-req2.pem: tests/pki/stamp
+ $(AM_V_GEN)cp tests/pki/test2-req.pem $@
+tests/testpki-privkey2.pem: tests/pki/stamp
+ $(AM_V_GEN)cp tests/pki/test2-privkey.pem $@
OVS_PKI = $(SHELL) $(srcdir)/utilities/ovs-pki.in --dir=tests/pki --log=tests/ovs-pki.log
tests/pki/stamp:
- rm -f tests/pki/stamp
- rm -rf tests/pki
- $(OVS_PKI) init
- $(OVS_PKI) req+sign tests/pki/test
- $(OVS_PKI) req+sign tests/pki/test2
+ $(AM_V_at)rm -f tests/pki/stamp
+ $(AM_V_at)rm -rf tests/pki
+ $(AM_V_GEN)$(OVS_PKI) init && \
+ $(OVS_PKI) req+sign tests/pki/test && \
+ $(OVS_PKI) req+sign tests/pki/test2 && \
: > tests/pki/stamp
CLEANFILES += tests/ovs-pki.log
projects / cascardo / ovs.git / blobdiff