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

diff --git a/tests/automake.mk b/tests/automake.mk
index 9d6623bd..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 \
@@ -55,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
@@ -108,15 +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/idltest.c tests/idltest.h
+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)
-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
+
+# 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
-EXTRA_DIST += tests/idltest.c tests/idltest.h tests/idltest.ovsschema
 
 noinst_PROGRAMS += tests/test-reconnect
 tests_test_reconnect_SOURCES = tests/test-reconnect.c
@@ -151,6 +162,8 @@ 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-req.pem
-
+	tests/testpki-privkey2.pem \
+	tests/testpki-req.pem \
+	tests/testpki-req2.pem