Changeset 33af2b7 in mod_gnutls for test/TestMakefile

Timestamp:

May 11, 2015, 6:28:20 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

31caead

Parents:

e24eed6

git-author:

Thomas Klute <thomas2.klute@…> (05/11/15 18:12:28)

git-committer:

Thomas Klute <thomas2.klute@…> (05/11/15 18:28:20)

Message:

Test suite: Add tests to "dist" target and support VPATH builds

Supporting VPATH builds requires using $srcdir to find non-generated
data rather than fixed relative paths. If test are not called through
the make system, local defaults must be used. Not changing directories
during tests any more makes this easier.

A few files (e.g. templates, generated CRL) have been moved around to
better match the new structure.

File:

• test/TestMakefile (modified) (7 diffs)

test/TestMakefile

@@ -5 +5 @@
 # run these tests to ensure that mod_gnutls can handle a range of
 # simple configuration choices.
+
+export srcdir ?= .
 
 export TEST_HOST ?= localhost
@@ -18 +20 @@
 
 all: setup.done
-        TEST_LOCK=$(TEST_LOCK) ./runtests
+        TEST_LOCK=$(TEST_LOCK) $(srcdir)/runtests
 
 t-%: setup.done
-        TEST_LOCK=$(TEST_LOCK) ./runtests $@
+        TEST_LOCK=$(TEST_LOCK) $(srcdir)/runtests $@
 
 
@@ -32 +34 @@
 all_tokens := $(foreach id,$(identities),$(foreach token,$(tokens),$(id)/$(token)))
 
-%.template: %.template.in
+%.template: $(srcdir)/%.template.in
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
 
-server.uid: server.uid.in
+%.uid: $(srcdir)/%.uid.in
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
 
@@ -67 +69 @@
 authority/x509.pem: authority.template authority/secret.key
         certtool --generate-self-signed --load-privkey authority/secret.key --template authority.template > $@
-rogueca/x509.pem: rogueca.template rogueca/secret.key
-        certtool --generate-self-signed --load-privkey rogueca/secret.key --template rogueca.template > $@
+rogueca/x509.pem: $(srcdir)/rogueca.template rogueca/secret.key
+        certtool --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template > $@
 
 %/cert-request: %.template %/secret.key 
@@ -77 +79 @@
 
 %/softhsm.db: %/x509.pem %/secret.key
-        SOFTHSM_CONF="$(*)-softhsm.conf" ./softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
+        SOFTHSM_CONF="$(srcdir)/$(*)-softhsm.conf" $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
+
+# Generate CRL revoking a certain certificate. Currently used to
+# revoke the server certificate and check if setting the CRL as
+# GnuTLSProxyCRLFile causes the connection to the back end server to
+# fail.
+%/crl.pem: %/x509.pem ${srcdir}/%-crl.template
+        certtool --generate-crl \
+                --load-ca-privkey authority/secret.key \
+                --load-ca-certificate authority/x509.pem \
+                --load-certificate $< \
+                --template "${srcdir}/$(*)-crl.template" \
+                > $@
 
 msva.gnupghome/trustdb.gpg: authority/minimal.pgp client/cert.pgp
@@ -87 +101 @@
 
 
-setup.done: $(all_tokens) msva.gnupghome/trustdb.gpg
+setup.done: $(all_tokens) msva.gnupghome/trustdb.gpg client.uid
         mkdir -p logs cache outputs
         touch setup.done
@@ -94 +108 @@
 clean:
         rm -rf server client authority logs cache outputs setup.done \
-        server.template msva.gnupghome \
+        server.template imposter.template msva.gnupghome \
         */*.pgp */*.gpg */*.gpg~ */*.pem */*.key authority.template \
-        client.template server.uid *.lock tests/*/*.pem
+        client.template client.uid server.uid *.lock tests/*/*.pem
         rmdir imposter rogueca || true