aboutsummaryrefslogtreecommitdiffstats
path: root/tests/openpgp/setup.scm
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2017-04-04 12:32:04 +0000
committerJustus Winter <[email protected]>2017-04-04 16:52:06 +0000
commit32b75fb7743f35936d7014fce33c90ba97dfa374 (patch)
treeb873add1fbe3813b090eac16cd0beec752364916 /tests/openpgp/setup.scm
parentgpgscm: Fix copying values. (diff)
downloadgnupg-32b75fb7743f35936d7014fce33c90ba97dfa374.tar.gz
gnupg-32b75fb7743f35936d7014fce33c90ba97dfa374.zip
tests: Fix setup of ephemeral home directories.
* tests/openpgp/defs.scm (with-ephemeral-home-directory): Create configuration files when we enter the context. * tests/openpgp/setup.scm: Do not use an ephemeral home directory. Tests should always use the cwd. * tests/gpgsm/setup.scm: Likewise. * tests/gpgsm/export.scm: Add explicit constructor function. * tests/openpgp/decrypt-session-key.scm: Likewise. * tests/openpgp/decrypt-unwrap-verify.scm: Likewise. -- Previously, ephemeral homedirectories lacked a configuration, hence GnuPG tried to start backend daemons using their installed locations. Fix this by explicitly creating a suitable configuration. GnuPG-bug-id: 3047 Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
-rwxr-xr-xtests/openpgp/setup.scm13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index 4b3bfcb41..a7d14e71c 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -40,10 +40,9 @@
'(gpgconf gpg gpg-agent scdaemon gpgsm dirmngr gpg-connect-agent
gpg-preset-passphrase gpgtar pinentry)))
-(with-ephemeral-home-directory
- (chdir (getenv "GNUPGHOME"))
- (create-gpghome)
- (start-agent)
- (create-legacy-gpghome)
- (stop-agent)
- (call-check `(,(tool 'gpgtar) --create --output ,(cadr *args*) ".")))
+(setenv "GNUPGHOME" (getcwd) #t)
+(create-gpghome)
+(start-agent)
+(create-legacy-gpghome)
+(stop-agent)
+(call-check `(,(tool 'gpgtar) --create --output ,(cadr *args*) "."))