tests: Fix environment setup.
authorJustus Winter <justus@g10code.com>
Tue, 8 Nov 2016 15:15:32 +0000 (16:15 +0100)
committerJustus Winter <justus@g10code.com>
Tue, 8 Nov 2016 15:15:32 +0000 (16:15 +0100)
* 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>
tests/openpgp/defs.scm

index 09c313b..e91902c 100644 (file)
 ;; 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))