Changeset d92899e in mod_gnutls


Ignore:
Timestamp:
May 9, 2015, 4:51:26 PM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
349fd6e
Parents:
3f00958
Message:

Test suite: Add lock file for the shared GnuPG keyring

Key import and signing modify the shared keyring, which leads to race
conditions with parallel make. Locking avoids this problem.

Location:
test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r3f00958 rd92899e  
    4141check_DATA = setup.done
    4242
    43 # Sadly, TestMakefile breaks when trying to generate keys and
    44 # certificates with parallel make. Until that's fixed, enforce "-j1".
    4543setup.done:
    46         $(MAKE) -f TestMakefile $(AM_MAKEFLAGS) -j1 $@
     44        $(MAKE) -f TestMakefile $(AM_MAKEFLAGS) $@
    4745
    4846MOSTLYCLEANFILES = cache/* logs/* outputs/*
  • test/TestMakefile

    r3f00958 rd92899e  
    5757        GNUPGHOME=$(dir $@) gpg --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" > $@
    5858
     59# Import and signing modify the shared keyring, which leads to race
     60# conditions with parallel make. Locking avoids this problem.
    5961%/cert.pgp: %/minimal.pgp authority/gpg.conf
    60         GNUPGHOME=authority gpg --import $<
    61         GNUPGHOME=authority gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
     62        GNUPGHOME=authority flock authority/lock gpg --import $<
     63        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 :)"
    6264        GNUPGHOME=authority gpg --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" > $@
    6365
Note: See TracChangeset for help on using the changeset viewer.