1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-05 23:07:49 +02:00

tests: Rework test environment setup.

* 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>
This commit is contained in:
Justus Winter 2016-10-07 16:17:49 +02:00
parent 1f76f8d8bc
commit cbbf0a7a8d

View File

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