mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
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 <justus@g10code.com>
This commit is contained in:
parent
2a7615c48e
commit
1062953d51
@ -256,13 +256,12 @@
|
|||||||
;; Initialize the test environment, install appropriate configuration
|
;; Initialize the test environment, install appropriate configuration
|
||||||
;; and start the agent, with the keys from the legacy test suite.
|
;; and start the agent, with the keys from the legacy test suite.
|
||||||
(define (setup-legacy-environment)
|
(define (setup-legacy-environment)
|
||||||
(setup-environment)
|
(create-gpghome)
|
||||||
(if (member "--unpack-tarball" *args*)
|
(if (member "--unpack-tarball" *args*)
|
||||||
(begin
|
(begin
|
||||||
(call-check `(,(tool 'gpgtar) --extract --directory=. ,(cadr *args*)))
|
(call-check `(,(tool 'gpgtar) --extract --directory=. ,(cadr *args*)))
|
||||||
(start-agent))
|
(start-agent))
|
||||||
(begin
|
(begin
|
||||||
(create-gpghome)
|
|
||||||
(start-agent)
|
(start-agent)
|
||||||
(create-legacy-gpghome)))
|
(create-legacy-gpghome)))
|
||||||
(preset-passphrases))
|
(preset-passphrases))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user