chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: checkout: Check we end up on the right branch each time
[dgit.git]
/
tests
/
setup
/
gnupg
diff --git
a/tests/setup/gnupg
b/tests/setup/gnupg
index 6100bf575fe7e8bfaf2d1b3d3a892d32544cd6c5..7a164eff2bd9b569b18c93040b598f26da921f81 100755
(executable)
--- a/
tests/setup/gnupg
+++ b/
tests/setup/gnupg
@@
-6,17
+6,21
@@
mkdir -p $tmp/gnupg
cp $troot/gnupg/* $tmp/gnupg
chmod go-rw $tmp/gnupg/*
cp $troot/gnupg/* $tmp/gnupg
chmod go-rw $tmp/gnupg/*
-export GNUPGHOME=$tmp/gnupg
+export DGIT_TEST_GNUPG_GLOBAL_LOCK=$tmp/gnupg/dgit-test-global-lock
+export DGIT_TEST_GNUPG_LOG=$tmp/gnupg-workarounds.log
-cat >$tmp/gnupg/gpg-agent.conf <<END
-log-file $tmp/gnupg/AGENT.log
+setup='
+ export GNUPGHOME=$tmp/gnupg
+ export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG
+
+ cat >$tmp/gnupg/gpg-agent.conf <<END
+ log-file $tmp/gnupg/AGENT.log
END
END
-#debug-all
+
#debug-all
-setup='
+ : ${DGIT_TEST_REAL_GPG_AGENT:=$(type -p gpg-agent)}
export DGIT_TEST_REAL_GPG_AGENT=$(type -p gpg-agent)
export DGIT_STUNT_AGENT=$troot/tstunt/gpg-agent
export DGIT_TEST_REAL_GPG_AGENT=$(type -p gpg-agent)
export DGIT_STUNT_AGENT=$troot/tstunt/gpg-agent
- export GNUPGHOME
t-tstunt gpg
'
t-tstunt gpg
'
@@
-24,6
+28,7
@@
eval "$setup"
gpg --list-secret
gpg --list-secret
-t-setup-done 'GNUPGHOME' 'gnupg' "$setup"
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \
+ 'gnupg' "$setup"
t-ok
t-ok