aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-11-08 15:15:32 +0000
committerJustus Winter <[email protected]>2016-11-08 15:15:32 +0000
commit1062953d5132af674aacfc6372e3e9f066c5d145 (patch)
treed8ab3a779719dd108b532fc9c45639aff5931155
parenttests: Log and display output from tests when run in parallel. (diff)
downloadgnupg-1062953d5132af674aacfc6372e3e9f066c5d145.tar.gz
gnupg-1062953d5132af674aacfc6372e3e9f066c5d145.zip
tests: Fix environment setup.
* tests/openpgp/defs.scm (setup-legacy-environment): Do not call 'setup-environment' because that will start the agent, and hence register the atexit function twice. Fixes: a55393cb5f4b331cb3a715c7d9a8b91f7606f337 Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
-rw-r--r--tests/openpgp/defs.scm3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 09c313b2a..e91902c79 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -256,13 +256,12 @@
;; Initialize the test environment, install appropriate configuration
;; and start the agent, with the keys from the legacy test suite.
(define (setup-legacy-environment)
- (setup-environment)
+ (create-gpghome)
(if (member "--unpack-tarball" *args*)
(begin
(call-check `(,(tool 'gpgtar) --extract --directory=. ,(cadr *args*)))
(start-agent))
(begin
- (create-gpghome)
(start-agent)
(create-legacy-gpghome)))
(preset-passphrases))