Merge branch 'mainstream'

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

diff --git a/tests/automake.mk b/tests/automake.mk
index 20f9e82..f531bf9 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -16,11 +16,12 @@ 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/bfd.at \
        tests/lacp.at \
        tests/learn.at \
        tests/vconn.at \
@@ -32,9 +33,12 @@ 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/vlan-splinters.at \
        tests/ofproto-macros.at \
        tests/ofproto.at \
        tests/ovsdb.at \
@@ -95,6 +99,7 @@ valgrind_wrappers = \
        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 \
@@ -103,6 +108,7 @@ valgrind_wrappers = \
        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 \
@@ -143,10 +149,15 @@ check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) \
        @echo 'Valgrind output can be found in tests/testsuite.dir/*/valgrind.*'
        @echo '----------------------------------------------------------------------'
 \f
+# OFTest support.
+
+check-oftest: all
+       srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-oftest
+EXTRA_DIST += tests/run-oftest
+\f
 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
@@ -167,6 +178,10 @@ 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-atomic
+tests_test_atomic_SOURCES = tests/test-atomic.c
+tests_test_atomic_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)
@@ -196,6 +211,10 @@ 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-hindex
+tests_test_hindex_SOURCES = tests/test-hindex.c
+tests_test_hindex_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)
@@ -210,7 +229,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 +251,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 +319,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 +328,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)