tests: Factor OVSDB_INIT out of OVS_VSCTL_SETUP for other tests to use.

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

diff --git a/tests/automake.mk b/tests/automake.mk
index 6284511..7a73a84 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -6,8 +6,10 @@ EXTRA_DIST += \
        $(srcdir)/tests/testsuite
 TESTSUITE_AT = \
        tests/testsuite.at \
+       tests/ovsdb-macros.at \
        tests/lcov-pre.at \
        tests/library.at \
+       tests/vconn.at \
        tests/dir_name.at \
        tests/aes128.at \
        tests/uuid.at \
@@ -15,6 +17,24 @@ TESTSUITE_AT = \
        tests/jsonrpc.at \
        tests/timeval.at \
        tests/lockfile.at \
+       tests/reconnect.at \
+       tests/ovsdb.at \
+       tests/ovsdb-log.at \
+       tests/ovsdb-types.at \
+       tests/ovsdb-data.at \
+       tests/ovsdb-column.at \
+       tests/ovsdb-table.at \
+       tests/ovsdb-row.at \
+       tests/ovsdb-condition.at \
+       tests/ovsdb-mutation.at \
+       tests/ovsdb-query.at \
+       tests/ovsdb-transaction.at \
+       tests/ovsdb-execution.at \
+       tests/ovsdb-trigger.at \
+       tests/ovsdb-file.at \
+       tests/ovsdb-server.at \
+       tests/ovsdb-monitor.at \
+       tests/ovsdb-idl.at \
        tests/stp.at \
        tests/ovs-vsctl.at \
        tests/lcov-post.at
@@ -22,7 +42,7 @@ TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
 
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
-       $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH='utilities:vswitchd:tests' $(TESTSUITEFLAGS)
+       $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH='utilities:vswitchd:ovsdb:tests' $(TESTSUITEFLAGS)
 
 clean-local:
        test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
@@ -79,7 +99,7 @@ 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
+tests_test_jsonrpc_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 noinst_PROGRAMS += tests/test-list
 tests_test_list_SOURCES = tests/test-list.c
@@ -89,6 +109,21 @@ noinst_PROGRAMS += tests/test-lockfile
 tests_test_lockfile_SOURCES = tests/test-lockfile.c
 tests_test_lockfile_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-ovsdb
+tests_test_ovsdb_SOURCES = tests/test-ovsdb.c tests/idltest.c tests/idltest.h
+tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
+EXTRA_DIST += tests/uuidfilt.pl tests/idltest.ovsidl
+BUILT_SOURCES += tests/idltest.c tests/idltest.h
+noinst_DATA += tests/idltest.ovsschema
+DISTCLEANFILES += tests/idltest.ovsschema
+tests/idltest.c tests/idltest.h tests/idltest.ovsschema: ovsdb/ovsdb-idlc.in
+tests/idltest.c: tests/idltest.h
+EXTRA_DIST += tests/idltest.c tests/idltest.h tests/idltest.ovsschema
+
+noinst_PROGRAMS += tests/test-reconnect
+tests_test_reconnect_SOURCES = tests/test-reconnect.c
+tests_test_reconnect_LDADD = lib/libopenvswitch.a
+
 noinst_PROGRAMS += tests/test-sha1
 tests_test_sha1_SOURCES = tests/test-sha1.c
 tests_test_sha1_LDADD = lib/libopenvswitch.a
@@ -102,7 +137,7 @@ tests_test_type_props_SOURCES = tests/test-type-props.c
 
 noinst_PROGRAMS += tests/test-dhcp-client
 tests_test_dhcp_client_SOURCES = tests/test-dhcp-client.c
-tests_test_dhcp_client_LDADD = lib/libopenvswitch.a $(FAULT_LIBS)
+tests_test_dhcp_client_LDADD = lib/libopenvswitch.a
 
 noinst_PROGRAMS += tests/test-stp
 tests_test_stp_SOURCES = tests/test-stp.c
@@ -115,4 +150,11 @@ 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)
-
+EXTRA_DIST += \
+       tests/testpki-cacert.pem \
+       tests/testpki-cert.pem \
+       tests/testpki-cert2.pem \
+       tests/testpki-privkey.pem \
+       tests/testpki-privkey2.pem \
+       tests/testpki-req.pem \
+       tests/testpki-req2.pem