X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=e1738f6991872e5dc6f960cbb0140e08da457b51;hb=c7f7adb70cb34bb568f9b6327d6adb945326e029;hp=3a54e13392b1c403bfa21f016b2beff97f5e9f91;hpb=41709cccb8099972f9c6c3faf583b1286cb92e8a;p=openvswitch

diff --git a/tests/automake.mk b/tests/automake.mk
index 3a54e133..e1738f69 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -6,8 +6,12 @@ EXTRA_DIST += \
 	$(srcdir)/tests/testsuite
 TESTSUITE_AT = \
 	tests/testsuite.at \
+	tests/ovsdb-macros.at \
 	tests/lcov-pre.at \
 	tests/library.at \
+	tests/check-structs.at \
+	tests/daemon.at \
+	tests/vconn.at \
 	tests/dir_name.at \
 	tests/aes128.at \
 	tests/uuid.at \
@@ -24,10 +28,15 @@ TESTSUITE_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
@@ -35,7 +44,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
@@ -50,11 +59,11 @@ $(TESTSUITE): package.m4 $(TESTSUITE_AT)
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 	:;{ \
 	  echo '# Signature of the current package.' && \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])' && \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])' && \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])' && \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])' && \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	  echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])' && \
+	  echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])' && \
+	  echo 'm4_define([AT_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])' && \
+	  echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])' && \
+	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
 	} >'$(srcdir)/package.m4'
 
 noinst_PROGRAMS += tests/test-aes128
@@ -92,7 +101,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
@@ -103,9 +112,22 @@ 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_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
+tests_test_ovsdb_SOURCES = \
+	tests/test-ovsdb.c \
+	tests/idltest.c \
+	tests/idltest.h
 EXTRA_DIST += tests/uuidfilt.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
+IDLTEST_IDL_FILES = tests/idltest.ovsschema tests/idltest.ann
+EXTRA_DIST += $(IDLTEST_IDL_FILES)
+tests/idltest.ovsidl: $(IDLTEST_IDL_FILES)
+	$(OVSDB_IDLC) -C $(srcdir) annotate $(IDLTEST_IDL_FILES) > $@.tmp
+	mv $@.tmp $@
+
+tests/idltest.c: tests/idltest.h
 
 noinst_PROGRAMS += tests/test-reconnect
 tests_test_reconnect_SOURCES = tests/test-reconnect.c
@@ -124,7 +146,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
@@ -137,4 +159,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