ovs-ofctl: Implement documented semantics of --flow-format for flow_mods.

[openvswitch] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index c50b62ea6dc27ea8bafd2c3d1ee206037c5360b7..e2d3388a41b1446ef69254166636b3715e2edcc9 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -12,6 +12,7 @@ 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 \
@@ -24,6 +25,7 @@ TESTSUITE_AT = \
        tests/timeval.at \
        tests/lockfile.at \
        tests/reconnect.at \
+       tests/ofproto-macros.at \
        tests/ofproto.at \
        tests/ovsdb.at \
        tests/ovsdb-log.at \
@@ -77,6 +79,7 @@ lcov_wrappers = \
        tests/lcov/test-lockfile \
        tests/lcov/test-multipath \
        tests/lcov/test-ovsdb \
+       tests/lcov/test-packets \
        tests/lcov/test-random \
        tests/lcov/test-reconnect \
        tests/lcov/test-sha1 \
@@ -129,6 +132,7 @@ valgrind_wrappers = \
        tests/valgrind/test-lockfile \
        tests/valgrind/test-multipath \
        tests/valgrind/test-ovsdb \
+       tests/valgrind/test-packets \
        tests/valgrind/test-random \
        tests/valgrind/test-reconnect \
        tests/valgrind/test-sha1 \
@@ -226,6 +230,10 @@ noinst_PROGRAMS += tests/test-multipath
 tests_test_multipath_SOURCES = tests/test-multipath.c
 tests_test_multipath_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-packets
+tests_test_packets_SOURCES = tests/test-packets.c
+tests_test_packets_LDADD = lib/libopenvswitch.a
+
 noinst_PROGRAMS += tests/test-random
 tests_test_random_SOURCES = tests/test-random.c
 tests_test_random_LDADD = lib/libopenvswitch.a
@@ -281,14 +289,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
@@ -301,3 +301,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