Merge commit 'b5d57fc87925cb3c029de19d0a94de5ca07ae28e'

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

diff --git a/tests/automake.mk b/tests/automake.mk
index 20f9e82..4442eb5 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,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 \
@@ -146,7 +148,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
@@ -210,7 +211,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
@@ -232,6 +233,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)
@@ -296,8 +301,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 \
@@ -307,6 +310,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)