diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-07 11:35:34 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-07 16:18:53 +0000 |
| commit | 640602b53ec3a387aef776d6a727118e1784f6d7 (patch) | |
| tree | c9ce7688135f51158c35f0676d5402673aacfbc2 /tests/setup/gnupg | |
| parent | edbc2fc23a2df787cc7c0d998df9724dcaceaaf7 (diff) | |
test suite: gnupg: Run with a lock held
This is also an attempt to reduce the impact of the gnupg races.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/setup/gnupg')
| -rwxr-xr-x | tests/setup/gnupg | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/setup/gnupg b/tests/setup/gnupg index 9b4d099..c88d40b 100755 --- a/tests/setup/gnupg +++ b/tests/setup/gnupg @@ -6,8 +6,11 @@ mkdir -p $tmp/gnupg cp $troot/gnupg/* $tmp/gnupg chmod go-rw $tmp/gnupg/* +export DGIT_TEST_GNUPG_GLOBAL_LOCK=$tmp/gnupg/dgit-test-global-lock + setup=' export GNUPGHOME=$tmp/gnupg + export DGIT_TEST_GNUPG_GLOBAL_LOCK cat >$tmp/gnupg/gpg-agent.conf <<END log-file $tmp/gnupg/AGENT.log @@ -24,6 +27,6 @@ eval "$setup" gpg --list-secret -t-setup-done '' 'gnupg' "$setup" +t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK' 'gnupg' "$setup" t-ok |