Changeset 5b6a5d9 in mod_gnutls for test

Timestamp:

Jan 23, 2016, 6:44:37 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, 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:

• Makefile.am (modified) (1 diff)
• test_ca.mk (modified) (1 diff)

test/Makefile.am

@@ -42 +42 @@
 x509_tokens = $(x509_certs) $(x509_keys)
 tokens = $(x509_tokens) $(pgp_tokens)
+
+if !DISABLE_FLOCK
+# flock command for write access to the authority keyring
+GPG_FLOCK = $(FLOCK) authority/lock
+endif
 
 include $(srcdir)/test_ca.mk

test/test_ca.mk

@@ -35 +35 @@
 # conditions with parallel make. Locking avoids this problem.
 %/cert.pgp: %/minimal.pgp authority/gpg.conf
-        GNUPGHOME=authority flock authority/lock gpg --import $<
-        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 :)"
+        GNUPGHOME=authority $(GPG_FLOCK) gpg --import $<
+        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 :)"
         GNUPGHOME=authority gpg --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" > $@