Changeset 89f863f in mod_gnutls for test/Makefile.am

Timestamp:

Oct 19, 2015, 9:07:40 PM (5 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, upstream

Children:

02c8e54, 24c6c16

Parents:

4addf74 (diff), 71cac80 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Imported Upstream version 0.7.1

File:

• test/Makefile.am (modified) (5 diffs)

test/Makefile.am

@@ -31 +31 @@
 TESTS = $(dist_check_SCRIPTS)
 
+# Identities in the miniature CA, server, and client environment for
+# the test suite
+identities = server authority client imposter rogueca
+# Append strings after ":=" to each identity to generate a list of
+# necessary files
+pgp_tokens = $(identities:=/secring.gpg) $(identities:=/cert.pgp) \
+        $(identities:=/secret.pgp)
+x509_keys = $(identities:=/secret.key)
+x509_certs = $(identities:=/x509.pem)
+x509_tokens = $(x509_certs) $(x509_keys)
+tokens = $(x509_tokens) $(pgp_tokens)
+
+include $(srcdir)/test_ca.mk
+
 # Test cases trying to create keys and certificates in parallel causes
 # race conditions. Ensure that all keys and certificates are generated
@@ -41 +55 @@
 # running at any time, so test cases actually have to wait for each
 # other - just not in any particular order.
-check_DATA = setup.done server/crl.pem
+check_DATA = $(tokens) server/crl.pem
 
-MOSTLYCLEANFILES = setup.done cache/* logs/* outputs/* server/crl.pem
+MOSTLYCLEANFILES = cache/* logs/* outputs/* server/crl.pem
 
 cert_templates = authority.template.in client.template.in \
@@ -50 +64 @@
         imposter.template server.template
 
+# Delete X.509 private keys on full clean. Note that unless you need
+# to generate fresh keys, the "mostlyclean" target should be
+# sufficient (see below).
+CLEANFILES = $(x509_keys)
+
 # Delete X.509 certificates and generated templates on "mostlyclean"
 # target. Certificates can be rebuilt without generating new key
@@ -55 +74 @@
 # (e.g. host names) without wasting entropy on new keys (which would
 # happen after "clean").
-MOSTLYCLEANFILES += */x509.pem $(generated_templates)
+MOSTLYCLEANFILES += */x509.pem $(generated_templates) *.uid
+
 
 # Delete PGP keyrings on "mostlyclean" target. They are created from
@@ -61 +81 @@
 # one day, so regenerating them is both fast and frequently
 # necessary.
-MOSTLYCLEANFILES += */*.pgp */*.gpg */*.gpg~ */gpg.conf
+MOSTLYCLEANFILES += */*.pgp */*.gpg */*.gpg~ */gpg.conf authority/lock
+# GnuPG random pool, no need to regenerate on every build
+CLEANFILES += authority/random_seed
 
-clean-local:
-        $(MAKE) -f $(srcdir)/TestMakefile $(AM_MAKEFLAGS) clean
+# Delete lock files for test servers on "mostlyclean" target.
+MOSTLYCLEANFILES += *.lock
+
+# rule to build MSVA trust database
+if USE_MSVA
+msva_home = msva.gnupghome
+check_DATA += $(msva_home)/trustdb.gpg client.uid
+MOSTLYCLEANFILES += $(msva_home)/trustdb.gpg
+$(msva_home)/trustdb.gpg: authority/minimal.pgp client/cert.pgp
+        mkdir -p -m 0700 $(dir $@)
+        GNUPGHOME=$(dir $@) gpg --import < $<
+        printf "%s:6:\n" "$$(GNUPGHOME=authority gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" | GNUPGHOME=$(dir $@) gpg --import-ownertrust
+        GNUPGHOME=$(dir $@) gpg --import < client/cert.pgp
+        printf "keyserver does-not-exist.example\n" > $(msva_home)/gpg.conf
+endif
 
 # SoftHSM files
 check_DATA += server/softhsm.db
-MOSTLYCLEANFILES += tests/24_pkcs11_cert/softhsm.conf
+MOSTLYCLEANFILES += tests/24_pkcs11_cert/softhsm.conf server/softhsm.db
 
-# This rule can be used for any TestMakefile target not included in
-# setup.done. The dependency on setup.done is used to avoid race
-# conditions between multiple calls to TestMakefile for key and
-# certificate generation. It is ignored for setup.done itself.
-server/crl.pem server/softhsm.db setup.done: setup.done
-        TEST_HOST="$(TEST_HOST)" TEST_IP="$(TEST_IP)" srcdir=$(srcdir) \
-        $(MAKE) -f $(srcdir)/TestMakefile $(AM_MAKEFLAGS) $@
 
+check_DATA += make-test-dirs
+extra_dirs = logs cache outputs
+make-test-dirs:
+        mkdir -p $(extra_dirs)
+.PHONY: make-test-dirs
+
+clean-local:
+        -rmdir $(identities) || true
+        -rmdir $(extra_dirs) || true
+if USE_MSVA
+        -rmdir $(msva_home) || true
+endif
+
+# Apache configuration and data files
 apache_data = base_apache.conf cgi_module.conf data/* mime.types proxy_mods.conf
 
 EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in proxy_backend.bash \
-        runtests server-crl.template server-softhsm.conf softhsm.bash \
-        TestMakefile
+        runtests server-crl.template server-softhsm.conf softhsm.bash
 
+# Lockfile for the main Apache process
+test_lockfile = ./test.lock
 # Maximum wait time in seconds for flock to aquire instance lock files
 lock_wait = 30
 
+# port for the main Apache server
+TEST_PORT ?= 9932
+# port for MSVA in test cases that use it
+MSVA_PORT ?= 9933
+# maximum time to wait for MSVA startup
+TEST_MSVA_MAX_WAIT ?= 10
+# wait loop time for MSVA startup
+TEST_MSVA_WAIT ?= 0.4
+# seconds for the HTTP request to be sent and responded to
+TEST_QUERY_DELAY ?= 30
+
 AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
         export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
-        export TEST_LOCK_WAIT=$(lock_wait); \
+        export TEST_LOCK="$(test_lockfile)"; \
+        export TEST_LOCK_WAIT="$(lock_wait)"; \
         export TEST_HOST="$(TEST_HOST)"; \
         export TEST_IP="$(TEST_IP)"; \
+        export TEST_PORT="$(TEST_PORT)"; \
+        export MSVA_PORT="$(MSVA_PORT)"; \
+        export TEST_MSVA_MAX_WAIT="$(TEST_MSVA_MAX_WAIT)"; \
+        export TEST_MSVA_WAIT="$(TEST_MSVA_WAIT)"; \
+        export TEST_QUERY_DELAY="$(TEST_QUERY_DELAY)"; \
         export BACKEND_HOST="$(TEST_HOST)"; \
         export BACKEND_IP="$(TEST_IP)";
+
+# Echo AM_TESTS_ENVIRONMENT. This can be useful for debugging, e.g. if
+# you want to manually run an Apache instance with Valgrind using the
+# same configuration as a test case.
+show-test-env: export TEST_ENV=$(AM_TESTS_ENVIRONMENT)
+show-test-env:
+        @echo "$${TEST_ENV}"