X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fautomake.mk;h=f67c0e78e6f12b839ecfda3ea1f6de7be1ff72ae;hb=ed099e921e30d3720c5ad7d1b4f911bb23911bf3;hp=8503b6c3f1bf38b8633a26a4e7368efdf92b6ac7;hpb=78f3f3164021402d7dbca495d1f3f48d81d9a353;p=sliver-openvswitch.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 8503b6c3f..f67c0e78e 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -12,7 +12,9 @@ TESTSUITE_AT = \
 	tests/check-structs.at \
 	tests/daemon.at \
 	tests/daemon-py.at \
+	tests/ofp-print.at \
 	tests/ovs-ofctl.at \
+	tests/multipath.at \
 	tests/vconn.at \
 	tests/file_name.at \
 	tests/aes128.at \
@@ -23,6 +25,7 @@ TESTSUITE_AT = \
 	tests/timeval.at \
 	tests/lockfile.at \
 	tests/reconnect.at \
+	tests/ofproto.at \
 	tests/ovsdb.at \
 	tests/ovsdb-log.at \
 	tests/ovsdb-types.at \
@@ -45,7 +48,7 @@ TESTSUITE_AT = \
 	tests/ovs-vsctl.at \
 	tests/interface-reconfigure.at
 TESTSUITE = $(srcdir)/tests/testsuite
-DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
+DISTCLEANFILES += tests/atconfig tests/atlocal
 
 AUTOTEST_PATH = utilities:vswitchd:ovsdb:tests
 
@@ -73,6 +76,7 @@ lcov_wrappers = \
 	tests/lcov/test-jsonrpc \
 	tests/lcov/test-list \
 	tests/lcov/test-lockfile \
+	tests/lcov/test-multipath \
 	tests/lcov/test-ovsdb \
 	tests/lcov/test-random \
 	tests/lcov/test-reconnect \
@@ -124,6 +128,7 @@ valgrind_wrappers = \
 	tests/valgrind/test-jsonrpc \
 	tests/valgrind/test-list \
 	tests/valgrind/test-lockfile \
+	tests/valgrind/test-multipath \
 	tests/valgrind/test-ovsdb \
 	tests/valgrind/test-random \
 	tests/valgrind/test-reconnect \
@@ -218,6 +223,10 @@ noinst_PROGRAMS += tests/test-lockfile
 tests_test_lockfile_SOURCES = tests/test-lockfile.c
 tests_test_lockfile_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-multipath
+tests_test_multipath_SOURCES = tests/test-multipath.c
+tests_test_multipath_LDADD = lib/libopenvswitch.a
+
 noinst_PROGRAMS += tests/test-random
 tests_test_random_SOURCES = tests/test-random.c
 tests_test_random_LDADD = lib/libopenvswitch.a
@@ -273,14 +282,6 @@ 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
 
 noinst_PROGRAMS += tests/test-byte-order
 tests_test_byte_order_SOURCES = tests/test-byte-order.c
@@ -293,3 +294,39 @@ EXTRA_DIST += \
 	tests/test-jsonrpc.py \
 	tests/test-ovsdb.py \
 	tests/test-reconnect.py
+
+if HAVE_OPENSSL
+TESTPKI_FILES = \
+	tests/testpki-cacert.pem \
+	tests/testpki-cert.pem \
+	tests/testpki-privkey.pem \
+	tests/testpki-req.pem \
+	tests/testpki-cert2.pem \
+	tests/testpki-privkey2.pem \
+	tests/testpki-req2.pem
+check_DATA += $(TESTPKI_FILES)
+CLEANFILES += $(TESTPKI_FILES)
+
+tests/testpki-cacert.pem: tests/pki/stamp; cp tests/pki/switchca/cacert.pem $@
+tests/testpki-cert.pem: tests/pki/stamp; cp tests/pki/test-cert.pem $@
+tests/testpki-req.pem: tests/pki/stamp; cp tests/pki/test-req.pem $@
+tests/testpki-privkey.pem: tests/pki/stamp; cp tests/pki/test-privkey.pem $@
+tests/testpki-cert2.pem: tests/pki/stamp; cp tests/pki/test2-cert.pem $@
+tests/testpki-req2.pem: tests/pki/stamp; cp tests/pki/test2-req.pem $@
+tests/testpki-privkey2.pem: tests/pki/stamp; cp tests/pki/test2-privkey.pem $@
+
+OVS_PKI = $(SHELL) $(srcdir)/utilities/ovs-pki.in --dir=tests/pki --log=tests/ovs-pki.log
+tests/pki/stamp:
+	rm -f tests/pki/stamp
+	rm -rf tests/pki
+	$(OVS_PKI) init
+	$(OVS_PKI) req+sign tests/pki/test
+	$(OVS_PKI) req+sign tests/pki/test2
+	: > tests/pki/stamp
+CLEANFILES += tests/ovs-pki.log
+
+CLEAN_LOCAL += clean-pki
+clean-pki:
+	rm -f tests/pki/stamp
+	rm -rf tests/pki
+endif