Changeset c825c3a in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
Jul 3, 2019, 1:52:50 AM (9 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
master
Children:
59afe51
Parents:
e5546be
Message:

Test suite: Move directory for server identity into authority directory

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    re5546be rc825c3a  
    5858shared_identities = authority authority/client
    5959pgp_identities = $(shared_identities)
    60 x509_only_identities = server rogueca imposter rogueclient
     60x509_only_identities = authority/server rogueca imposter rogueclient
    6161if ENABLE_OCSP_TEST
    6262x509_only_identities += ocsp-responder
     
    9393# running at any time, so test cases actually have to wait for each
    9494# other - just not in any particular order.
    95 check_DATA = $(tokens) server/crl.pem
    96 
    97 MOSTLYCLEANFILES = cache/* logs/* outputs/* server/crl.pem
     95check_DATA = $(tokens) authority/server/crl.pem
     96
     97MOSTLYCLEANFILES = cache/* logs/* outputs/* authority/server/crl.pem
    9898
    9999cert_templates = authority/template.in authority/client/template.in \
    100100        imposter/template.in ocsp-responder/template rogueca/template \
    101         rogueclient/template.in server/template.in
     101        rogueclient/template.in authority/server/template.in
    102102generated_templates = authority/template authority/client/template \
    103         imposter/template rogueclient/template server/template
     103        imposter/template rogueclient/template authority/server/template
    104104
    105105# Delete X.509 private keys on full clean. Note that unless you need
     
    161161MOSTLYCLEANFILES += authority/ocsp_index.txt authority/ocsp_index.txt.attr
    162162authority/ocsp_index.txt: $(x509_tokens) gen_ocsp_index authority/ocsp_index.txt.attr
    163         ./gen_ocsp_index server/x509.pem authority/client/x509.pem > $@
     163        ./gen_ocsp_index authority/server/x509.pem authority/client/x509.pem > $@
    164164
    165165authority/ocsp_index.txt.attr: authority/secret.key
     
    167167
    168168# build certificate chain file for server
    169 check_DATA += server/x509-chain.pem
    170 MOSTLYCLEANFILES += server/x509-chain.pem
     169check_DATA += authority/server/x509-chain.pem
     170MOSTLYCLEANFILES += authority/server/x509-chain.pem
    171171%/x509-chain.pem: %/x509.pem authority/x509.pem
    172172        cat $< authority/x509.pem > $@
     
    175175# SoftHSM tokens. Note that the SoftHSM 2 token is a directory and
    176176# hence has to be treated slightly differently.
    177 SOFTHSM_TOKEN = server/softhsm.db
    178 SOFTHSM2_TOKEN = server/softhsm2.db
     177SOFTHSM_TOKEN = authority/server/softhsm.db
     178SOFTHSM2_TOKEN = authority/server/softhsm2.db
    179179
    180180# Tokens should be cleaned whether or not the matching SoftHSM version
     
    233233
    234234EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
    235         apache_service.bash common.bash runtests server/crl.template \
     235        apache_service.bash common.bash runtests authority/server/crl.template \
    236236        softhsm.bash
    237237
Note: See TracChangeset for help on using the changeset viewer.