Changeset c91382d in mod_gnutls


Ignore:
Timestamp:
Jun 6, 2019, 2:38:35 AM (9 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
master
Children:
a819501
Parents:
143bd98
Message:

Test suite: Move UID files into per-identity directories

Location:
test
Files:
3 edited
5 moved

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r143bd98 rc91382d  
    113113# (e.g. host names) without wasting time on new keys (which would
    114114# happen after "clean").
    115 MOSTLYCLEANFILES += */x509.pem $(generated_templates) *.uid
     115MOSTLYCLEANFILES += */x509.pem $(generated_templates) */uid
    116116
    117117
     
    145145if USE_MSVA
    146146msva_home = msva.gnupghome
    147 check_DATA += $(msva_home)/trustdb.gpg client.uid
     147check_DATA += $(msva_home)/trustdb.gpg client/uid
    148148MOSTLYCLEANFILES += $(msva_home)/trustdb.gpg
    149149$(msva_home)/trustdb.gpg: authority/minimal.pgp client/cert.pgp
     
    215215# stops.
    216216clean-local:
    217         -rmdir $(identities) || true
    218217        -rmdir $(extra_dirs) || true
    219218if USE_MSVA
     
    232231        proxy_mods.conf
    233232
    234 EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \
     233EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
    235234        apache_service.bash common.bash runtests server-crl.template \
    236235        softhsm.bash
  • test/runtests

    r143bd98 rc91382d  
    139139    export MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT"
    140140
    141     msva_test_cmd="msva-query-agent https \"$(cat client.uid)\" x509pem client < client/x509.pem"
     141    msva_test_cmd="msva-query-agent https \"$(cat client/uid)\" x509pem client < client/x509.pem"
    142142    # check if MSVA is up, fail if not
    143143    if wait_ready "${msva_test_cmd}"; then
  • test/test_ca.mk

    r143bd98 rc91382d  
    1515        sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS#\\n}," $@
    1616
    17 %.uid: $(srcdir)/%.uid.in
     17%/uid: $(srcdir)/%/uid.in
    1818        sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
    1919
     
    2525.PRECIOUS: %/secret.key
    2626
    27 %/secret.pgp.raw: %.uid %/secret.key
     27%/secret.pgp.raw: %/uid %/secret.key
    2828        PEM2OPENPGP_USAGE_FLAGS=authenticate,certify,sign pem2openpgp "$$(cat $<)" < $(dir $@)secret.key > $@
    2929
Note: See TracChangeset for help on using the changeset viewer.