mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
tests: Improve GPGHOME handling.
* tests/openpgp/defs.scm (GPGHOME): New variable. * tests/openpgp/ssh-import.scm: Remove redundant code, use 'path-join'. * tests/openpgp/tofu.scm: Likewise. Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
parent
0801f49b0d
commit
8b1611a960
3 changed files with 6 additions and 12 deletions
|
@ -20,10 +20,6 @@
|
|||
(load (with-path "defs.scm"))
|
||||
(setup-environment)
|
||||
|
||||
(define GNUPGHOME (getenv "GNUPGHOME"))
|
||||
(if (string=? "" GNUPGHOME)
|
||||
(fail "GNUPGHOME not set"))
|
||||
|
||||
(setenv "SSH_AUTH_SOCK"
|
||||
(call-check `(,(tool 'gpgconf) --null --list-dirs agent-ssh-socket))
|
||||
#t)
|
||||
|
@ -55,7 +51,7 @@
|
|||
car keys)
|
||||
|
||||
(info "Checking for issue2316...")
|
||||
(unlink (string-append GNUPGHOME "/sshcontrol"))
|
||||
(unlink (path-join GNUPGHOME "sshcontrol"))
|
||||
(pipe:do
|
||||
(pipe:open (path-join (in-srcdir "samplekeys")
|
||||
(string-append "ssh-rsa.key"))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue