Changeset c91382d in mod_gnutls

Timestamp:

Jun 6, 2019, 2:38:35 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

a819501

Parents:

143bd98

Message:

Test suite: Move UID files into per-identity directories

Location:

test

Files:

• Makefile.am (modified) (4 diffs)
• authority/uid.in (moved) (moved from test/authority.uid.in)
• client/uid.in (moved) (moved from test/client.uid.in)
• imposter/uid.in (moved) (moved from test/imposter.uid.in)
• rogueca/uid.in (moved) (moved from test/rogueca.uid.in)
• runtests (modified) (1 diff)
• server/uid.in (moved) (moved from test/server.uid.in)
• test_ca.mk (modified) (2 diffs)

test/Makefile.am

@@ -113 +113 @@
 # (e.g. host names) without wasting time on new keys (which would
 # happen after "clean").
-MOSTLYCLEANFILES += */x509.pem $(generated_templates) *.uid
+MOSTLYCLEANFILES += */x509.pem $(generated_templates) */uid
 
 
@@ -145 +145 @@
 if USE_MSVA
 msva_home = msva.gnupghome
-check_DATA += $(msva_home)/trustdb.gpg client.uid
+check_DATA += $(msva_home)/trustdb.gpg client/uid
 MOSTLYCLEANFILES += $(msva_home)/trustdb.gpg
 $(msva_home)/trustdb.gpg: authority/minimal.pgp client/cert.pgp
@@ -215 +215 @@
 # stops.
 clean-local:
-        -rmdir $(identities) || true
         -rmdir $(extra_dirs) || true
 if USE_MSVA
@@ -232 +231 @@
         proxy_mods.conf
 
-EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \
+EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
         apache_service.bash common.bash runtests server-crl.template \
         softhsm.bash

test/runtests

@@ -139 +139 @@
     export MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT"
 
-    msva_test_cmd="msva-query-agent https \"$(cat client.uid)\" x509pem client < client/x509.pem"
+    msva_test_cmd="msva-query-agent https \"$(cat client/uid)\" x509pem client < client/x509.pem"
     # check if MSVA is up, fail if not
     if wait_ready "${msva_test_cmd}"; then

test/test_ca.mk

@@ -15 +15 @@
         sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS#\\n}," $@
 
-%.uid: $(srcdir)/%.uid.in
+%/uid: $(srcdir)/%/uid.in
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
 
@@ -25 +25 @@
 .PRECIOUS: %/secret.key
 
-%/secret.pgp.raw: %.uid %/secret.key
+%/secret.pgp.raw: %/uid %/secret.key
         PEM2OPENPGP_USAGE_FLAGS=authenticate,certify,sign pem2openpgp "$$(cat $<)" < $(dir $@)secret.key > $@