diff options
Diffstat (limited to 'tests/openpgp/defs.scm')
| -rw-r--r-- | tests/openpgp/defs.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm index 1531dc1..b5e3078 100644 --- a/tests/openpgp/defs.scm +++ b/tests/openpgp/defs.scm @@ -316,6 +316,7 @@ (display (make-random-string size) port)))) (define (create-file name . lines) + (catch #f (unlink name)) (letfd ((fd (open name (logior O_WRONLY O_CREAT O_BINARY) #o600))) (let ((port (fdopen fd "wb"))) (for-each (lambda (line) (display line port) (newline port)) @@ -348,7 +349,10 @@ "allow-preset-passphrase" "no-grab" "enable-ssh-support" + (if (flag "--extended-key-format" *args*) + "enable-extended-key-format" "#enable-extended-key-format") (string-append "pinentry-program " (tool 'pinentry)) + (string-append "scdaemon-program " (tool 'scdaemon)) )) ;; Initialize the test environment, install appropriate configuration @@ -447,7 +451,7 @@ (with-home-directory gnupghome (stop-agent))))) (catch (log "Warning: Creating socket directory failed:" (car *error*)) - (call-popen `(,(tool 'gpgconf) --create-socketdir) "")) + (gpg-conf '--create-socketdir)) (call-check `(,(tool 'gpg-connect-agent) --verbose ,(string-append "--agent-program=" (tool 'gpg-agent) "|--debug-quick-random") @@ -456,9 +460,9 @@ ;; Stop the agent and other daemons and remove the socket dir. (define (stop-agent) (log "Stopping gpg-agent...") - (call-check `(,(tool 'gpgconf) --kill all)) + (gpg-conf '--kill 'all) (catch (log "Warning: Removing socket directory failed.") - (call-popen `(,(tool 'gpgconf) --remove-socketdir) ""))) + (gpg-conf '--remove-socketdir))) ;; end |