X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fautomake.mk;h=8649b80480d89f80dd5f347c976f37d2809795e3;hb=2b021bdea761a24ea3cc2efc55db17cda368fa8a;hp=5f6800bfd9457127ca9f2f850c322889776b0770;hpb=f8064ac96e4aa1600861f1d76ab424e0425ba429;p=sliver-openvswitch.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 5f6800bfd..8649b8048 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -8,14 +8,18 @@ TESTSUITE_AT = \
 	tests/testsuite.at \
 	tests/ovsdb-macros.at \
 	tests/library.at \
+	tests/bundle.at \
 	tests/classifier.at \
 	tests/check-structs.at \
 	tests/daemon.at \
 	tests/daemon-py.at \
 	tests/ofp-print.at \
 	tests/ovs-ofctl.at \
+	tests/odp.at \
 	tests/multipath.at \
 	tests/autopath.at \
+	tests/lacp.at \
+	tests/learn.at \
 	tests/vconn.at \
 	tests/file_name.at \
 	tests/aes128.at \
@@ -26,6 +30,7 @@ TESTSUITE_AT = \
 	tests/timeval.at \
 	tests/lockfile.at \
 	tests/reconnect.at \
+	tests/ofproto-dpif.at \
 	tests/ofproto-macros.at \
 	tests/ofproto.at \
 	tests/ovsdb.at \
@@ -46,9 +51,12 @@ TESTSUITE_AT = \
 	tests/ovsdb-server.at \
 	tests/ovsdb-monitor.at \
 	tests/ovsdb-idl.at \
-	tests/ovsdb-idl-py.at \
 	tests/ovs-vsctl.at \
-	tests/interface-reconfigure.at
+	tests/ovs-monitor-ipsec.at \
+	tests/ovs-xapi-sync.at \
+	tests/stp.at \
+	tests/interface-reconfigure.at \
+	tests/vlog.at
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal
 
@@ -62,10 +70,12 @@ check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 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 \
@@ -78,11 +88,13 @@ lcov_wrappers = \
 	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 \
@@ -114,10 +126,12 @@ check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
 valgrind_wrappers = \
 	tests/valgrind/ovs-appctl \
 	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-bundle \
 	tests/valgrind/test-byte-order \
 	tests/valgrind/test-classifier \
 	tests/valgrind/test-csum \
@@ -130,11 +144,13 @@ valgrind_wrappers = \
 	tests/valgrind/test-list \
 	tests/valgrind/test-lockfile \
 	tests/valgrind/test-multipath \
+	tests/valgrind/test-odp \
 	tests/valgrind/test-ovsdb \
 	tests/valgrind/test-packets \
 	tests/valgrind/test-random \
 	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 \
@@ -184,6 +200,10 @@ 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
@@ -237,10 +257,18 @@ 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 \
@@ -250,7 +278,7 @@ EXTRA_DIST += tests/uuidfilt.pl tests/ovsdb-monitor-sort.pl
 tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
 
 # idltest schema and IDL
-OVSIDL_BUILT +=	tests/idltest.c tests/idltest.h tests/idltest.ovsidl
+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)
 tests/idltest.ovsidl: $(IDLTEST_IDL_FILES)
@@ -277,6 +305,10 @@ 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
@@ -295,7 +327,9 @@ EXTRA_DIST += \
 	tests/test-json.py \
 	tests/test-jsonrpc.py \
 	tests/test-ovsdb.py \
-	tests/test-reconnect.py
+	tests/test-reconnect.py \
+	tests/MockXenAPI.py \
+	tests/test-vlog.py
 
 if HAVE_OPENSSL
 TESTPKI_FILES = \