tests: Rework test environment setup.
authorJustus Winter <justus@g10code.com>
Fri, 7 Oct 2016 14:17:49 +0000 (16:17 +0200)
committerJustus Winter <justus@g10code.com>
Fri, 7 Oct 2016 14:25:55 +0000 (16:25 +0200)
* tests/openpgp/setup.scm: Import one keyring at a time.  This works
around a yet to be investigated hang on Windows.  It is also much
prettier.

Signed-off-by: Justus Winter <justus@g10code.com>
tests/openpgp/setup.scm

index 0a9a153..75310d1 100755 (executable)
                 "C6A6390E9388CDBAD71EAEA698233FE5E04F001E"
                 "D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3"))
 
-  (info "Importing public demo and test keys")
-  (call-check `(,@GPG --yes --import
-                     ,(in-srcdir "pubdemo.asc")
-                     ,(in-srcdir "pubring.asc")
-                     ,(in-srcdir key-file1)))
+  (for-each-p
+   "Importing public demo and test keys"
+   (lambda (file)
+     (call-check `(,@GPG --yes --import ,(in-srcdir file))))
+   (list "pubdemo.asc" "pubring.asc" key-file1))
+
   (pipe:do
    (pipe:open (in-srcdir "pubring.pkr.asc") (logior O_RDONLY O_BINARY))
    (pipe:spawn `(,@GPG --dearmor))