Changeset 5b6a5d9 in mod_gnutls for test


Ignore:
Timestamp:
Jan 23, 2016, 6:44:37 PM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
948c181
Parents:
f87c1b5
Message:

Test suite: Honor "--disable-flock" while creating PGP certificates

Two hardcoded calls to flock were left in the rule to create PGP
certificates. They did not use timeouts and thus should work even on
Hurd, but the "--disable-flock" option should be applied consistently.

Location:
test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    rf87c1b5 r5b6a5d9  
    4242x509_tokens = $(x509_certs) $(x509_keys)
    4343tokens = $(x509_tokens) $(pgp_tokens)
     44
     45if !DISABLE_FLOCK
     46# flock command for write access to the authority keyring
     47GPG_FLOCK = $(FLOCK) authority/lock
     48endif
    4449
    4550include $(srcdir)/test_ca.mk
  • test/test_ca.mk

    rf87c1b5 r5b6a5d9  
    3535# conditions with parallel make. Locking avoids this problem.
    3636%/cert.pgp: %/minimal.pgp authority/gpg.conf
    37         GNUPGHOME=authority flock authority/lock gpg --import $<
    38         GNUPGHOME=authority flock authority/lock gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
     37        GNUPGHOME=authority $(GPG_FLOCK) gpg --import $<
     38        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 :)"
    3939        GNUPGHOME=authority gpg --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" > $@
    4040
Note: See TracChangeset for help on using the changeset viewer.