diff options
| author | Justus Winter <[email protected]> | 2016-10-07 14:17:49 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-10-07 14:25:55 +0000 |
| commit | cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26 (patch) | |
| tree | 3ead421e03d0e7483a5c79f0837ff9c65c983b3b | |
| parent | tests: Improve handling of Windows newlines. (diff) | |
| download | gnupg-cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26.tar.gz gnupg-cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26.zip | |
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 <[email protected]>
Diffstat (limited to '')
| -rwxr-xr-x | tests/openpgp/setup.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm index 0a9a153f3..75310d124 100755 --- a/tests/openpgp/setup.scm +++ b/tests/openpgp/setup.scm @@ -84,11 +84,12 @@ "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)) |