Changeset ee94de5 in mod_gnutls


Ignore:
Timestamp:
Oct 12, 2017, 12:54:14 PM (2 months ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
master
Children:
321912b
Parents:
acea635
git-author:
Thomas Klute <thomas2.klute@…> (10/12/17 12:41:31)
git-committer:
Thomas Klute <thomas2.klute@…> (10/12/17 12:54:14)
Message:

Test suite: Clean up for current GnuPG versions

Newer GnuPG versions start gpg-agent processes per GNUPGHOME (one for
every PGP identity) while creating the PGP certificates and leave an
authority/tofu.db file. Stop agent processes during check or
mostlyclean targets to be sure they are gone and do not interfere with
later test runs.

Location:
test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    racea635 ree94de5  
    114114# necessary.
    115115MOSTLYCLEANFILES += */*.pgp */*.pgp.raw */*.gpg */*.gpg~ */gpg.conf \
    116         authority/lock */*.kbx */*.kbx~ */S.gpg-agent */private-keys-v1.d/*
     116        authority/lock */*.kbx */*.kbx~ */S.gpg-agent */private-keys-v1.d/* \
     117        authority/tofu.db
    117118# GnuPG random pool, no need to regenerate on every build
    118119CLEANFILES += authority/random_seed
     120
     121# GnuPG 2 starts gpg-agent processes per GNUPGHOME (one for every PGP
     122# identity) while creating the PGP certificates. This target is called
     123# by both "check-local" and "mostlyclean-local": The former because
     124# agent processes are started while preparing for "check" and are no
     125# longer needed afterwards, the latter to make sure they are gone
     126# along with their certificates.
     127stop-gnupg-agent:
     128        for id in $(pgp_identities) $(msva_home); do \
     129                GNUPGHOME=$$id/ gpgconf --kill gpg-agent || true; \
     130        done
     131
     132check-local: stop-gnupg-agent
    119133
    120134# Delete lock files for test servers on "mostlyclean" target.
     
    129143        mkdir -p -m 0700 $(dir $@)
    130144        GNUPGHOME=$(dir $@) gpg --import < $<
    131         printf "%s:6:\n" "$$(GNUPGHOME=authority gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" | GNUPGHOME=$(dir $@) gpg --import-ownertrust
     145        printf "%s:6:\n" "$$(GNUPGHOME=authority/ gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" | GNUPGHOME=$(dir $@) gpg --import-ownertrust
    132146        GNUPGHOME=$(dir $@) gpg --import < client/cert.pgp
    133147        printf "keyserver does-not-exist.example\n" > $(msva_home)/gpg.conf
     
    176190        mkdir -p $(extra_dirs)
    177191
    178 .PHONY: make-test-dirs clean-softhsm2-db
    179 
    180 mostlyclean-local: clean-softhsm2-db
     192.PHONY: make-test-dirs clean-softhsm2-db stop-gnupg-agent
     193
     194
     195mostlyclean-local: clean-softhsm2-db stop-gnupg-agent
    181196        -rmdir $(pgp_identities:=/private-keys-v1.d) || true
    182197if USE_MSVA
  • test/test_ca.mk

    r04addef ree94de5  
    4848%/cert.pgp: %/minimal.pgp authority/minimal.pgp
    4949        if test -r $@; then rm $@; fi
    50         GNUPGHOME=authority $(GPG_FLOCK) gpg --import $<
    51         GNUPGHOME=authority $(GPG_FLOCK) gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
    52         GNUPGHOME=authority $(GPG_FLOCK) gpg --output $@ --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
     50        GNUPGHOME=authority/ $(GPG_FLOCK) gpg --import $<
     51        GNUPGHOME=authority/ $(GPG_FLOCK) gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
     52        GNUPGHOME=authority/ $(GPG_FLOCK) gpg --output $@ --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
    5353
    5454# special cases for the authorities' root certs:
Note: See TracChangeset for help on using the changeset viewer.