Changeset a819501 in mod_gnutls for test

Timestamp:

Jun 24, 2019, 2:46:11 PM (4 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

f205c5f

Parents:

c91382d

Message:

Test suite: Move template files into per-identity directories

Also ensure that per-identity build directories exist for VPATH builds.

Location:

test

Files:

• Makefile.am (modified) (2 diffs)
• authority/template.in (moved) (moved from test/authority.template.in)
• client/template.in (moved) (moved from test/client.template.in)
• imposter/template.in (moved) (moved from test/imposter.template.in)
• ocsp-responder/template (moved) (moved from test/ocsp-responder.template)
• rogueca/template (moved) (moved from test/rogueca.template)
• rogueclient/template.in (moved) (moved from test/rogueclient.template.in)
• server/crl.template (moved) (moved from test/server-crl.template)
• server/template.in (moved) (moved from test/server.template.in)
• test_ca.mk (modified) (5 diffs)

test/Makefile.am

@@ -97 +97 @@
 MOSTLYCLEANFILES = cache/* logs/* outputs/* server/crl.pem
 
-cert_templates = authority.template.in client.template.in \
-        imposter.template.in ocsp-responder.template rogueca.template \
-        rogueclient.template.in server.template.in
-generated_templates = authority.template client.template \
-        imposter.template rogueclient.template server.template
+cert_templates = authority/template.in client/template.in \
+        imposter/template.in ocsp-responder/template rogueca/template \
+        rogueclient/template.in server/template.in
+generated_templates = authority/template client/template \
+        imposter/template rogueclient/template server/template
 
 # Delete X.509 private keys on full clean. Note that unless you need
@@ -232 +232 @@
 
 EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
-        apache_service.bash common.bash runtests server-crl.template \
+        apache_service.bash common.bash runtests server/crl.template \
         softhsm.bash
 

test/test_ca.mk

@@ -7 +7 @@
 # for the test suite
 
-%.template: $(srcdir)/%.template.in
+%/template: $(srcdir)/%/template.in %
+        @mkdir -m 0700 -p $(@D)
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
         sed -i -e "s,__OCSP_URI__,$(OCSP_URI_TEMPLATE)," $@
@@ -15 +16 @@
         sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS#\\n}," $@
 
-%/uid: $(srcdir)/%/uid.in
+%/uid: $(srcdir)/%/uid.in %
+        @mkdir -m 0700 -p $(@D)
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
 
-%/secret.key:
-        mkdir -p $(dir $@)
-        chmod 0700 $(dir $@)
+%/secret.key: %
+        @mkdir -m 0700 -p $(@D)
         certtool --outfile $@ --generate-privkey
 
@@ -56 +57 @@
 
 # special cases for the authorities' root certs:
-authority/x509.pem: authority.template authority/secret.key
-        certtool --outfile $@ --generate-self-signed --load-privkey authority/secret.key --template authority.template
-rogueca/x509.pem: $(srcdir)/rogueca.template rogueca/secret.key
-        certtool --outfile $@ --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template
+authority/x509.pem: authority/template authority/secret.key
+        certtool --outfile $@ --generate-self-signed --load-privkey authority/secret.key --template authority/template
+rogueca/x509.pem: $(srcdir)/rogueca/template rogueca/secret.key
+        certtool --outfile $@ --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca/template
 
 # normal case: certificates signed by test CA
-%/x509.pem: %.template %/secret.key authority/secret.key authority/x509.pem
+%/x509.pem: %/template %/secret.key authority/secret.key authority/x509.pem
         certtool --outfile $@ --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-privkey $(dir $@)secret.key --template $<
 
 # error case: certificates signed by rogue CA
-rogue%/x509.pem: rogue%.template rogue%/secret.key rogueca/x509.pem
+rogue%/x509.pem: rogue%/template rogue%/secret.key rogueca/x509.pem
         certtool --outfile $@ --generate-certificate --load-ca-certificate rogueca/x509.pem --load-ca-privkey rogueca/secret.key --load-privkey $(dir $@)secret.key --template $<
 
@@ -92 +93 @@
 # GnuTLSProxyCRLFile causes the connection to the back end server to
 # fail.
-%/crl.pem: %/x509.pem ${srcdir}/%-crl.template
+%/crl.pem: %/x509.pem ${srcdir}/%/crl.template
         certtool --generate-crl \
                 --outfile $@ \
@@ -98 +99 @@
                 --load-ca-certificate authority/x509.pem \
                 --load-certificate $< \
-                --template "${srcdir}/$(*)-crl.template"
+                --template "${srcdir}/$(*)/crl.template"