tests: Add sFlow test.

[sliver-openvswitch.git] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 3e42a3e..275ff53 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -16,11 +16,11 @@ TESTSUITE_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 \
@@ -32,6 +32,7 @@ TESTSUITE_AT = \
        tests/jsonrpc.at \
        tests/jsonrpc-py.at \
        tests/timeval.at \
+       tests/tunnel.at \
        tests/lockfile.at \
        tests/reconnect.at \
        tests/ofproto-dpif.at \
@@ -84,64 +85,6 @@ check-pycov: all tests/atconfig tests/atlocal $(TESTSUITE) clean-pycov
        @echo
        @COVERAGE_FILE=$(COVERAGE_FILE) $(COVERAGE) report
 \f
-# 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
-\f
 # valgrind support
 
 valgrind_wrappers = \
@@ -204,7 +147,6 @@ check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) \
 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
@@ -268,7 +210,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
@@ -290,6 +232,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)
@@ -365,6 +311,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)