[Pkg-gnupg-commit] [gpgme] 32/62: tests, python: Atomic directory creation

Daniel Kahn Gillmor dkg at fifthhorseman.net
Sat Nov 19 04:03:34 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gpgme.

commit 41d8c7e51a8989be633b9ada124c58a01fae7d54
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Wed Oct 19 12:04:07 2016 +0300

    tests,python: Atomic directory creation
    
    * lang/python/tests/Makefile.am:  Use MIDIR_P.
    * tests/gpg/Makefile.am: Ditto.
    * tests/gpgsm/Makefile.am: Ditto.
    
    --
    Solves race in parallel build when mkdir fails if directory exists.
    
    Signed-off-by: Alon Bar-Lev <alon.barlev at gmail.com>
    
    - Tweaked the ChangeLog
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 lang/python/tests/Makefile.am | 2 +-
 tests/gpg/Makefile.am         | 2 +-
 tests/gpgsm/Makefile.am       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index aa88bdc..39f532c 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -89,7 +89,7 @@ clean-local:
 
 
 ./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
-	test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
+	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \
         done
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index dd33b0a..c46feb0 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -93,7 +93,7 @@ export GNUPGHOME := $(abs_builddir)
 export GPG_AGENT_INFO :=
 
 ./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys)
-	test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
+	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
         done
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 41645b6..46d6a9b 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -70,7 +70,7 @@ export GPG_AGENT_INFO :=
 	echo faked-system-time 1008241200 >> ./gpgsm.conf
 
 ./private-keys-v1.d/$(key_id).key: $(srcdir)/$(key_id)
-	test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
+	$(MKDIR_P) ./private-keys-v1.d
 	cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key
 
 ./trustlist.txt:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git



More information about the Pkg-gnupg-commit mailing list