diff options
| author | Justus Winter <[email protected]> | 2017-01-16 12:59:56 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-01-16 12:59:56 +0000 |
| commit | 8b1611a9605b636db3e07a9d81016a11b318724c (patch) | |
| tree | b527fb8d0972a60398d7036ef64be431749ef0c5 /tests/openpgp/ssh-import.scm | |
| parent | agent: Ask specific SERIALNO for pksign/pkdecrypt. (diff) | |
| download | gnupg-8b1611a9605b636db3e07a9d81016a11b318724c.tar.gz gnupg-8b1611a9605b636db3e07a9d81016a11b318724c.zip | |
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 <[email protected]>
Diffstat (limited to 'tests/openpgp/ssh-import.scm')
| -rwxr-xr-x | tests/openpgp/ssh-import.scm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/openpgp/ssh-import.scm b/tests/openpgp/ssh-import.scm index e8f12d36c..ad5acc5f7 100755 --- a/tests/openpgp/ssh-import.scm +++ b/tests/openpgp/ssh-import.scm @@ -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")) |