aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-08-04 11:04:28 +0000
committerWerner Koch <[email protected]>2016-08-04 11:04:28 +0000
commit0c2a745a2bc21e8f439930f7c0e5d1521c2fd44c (patch)
tree7efc6cafed6fe2ec3eb45f19fb5e30a59e83dbdf
parentgpgconf: Add limited support for -0. (diff)
downloadgnupg-0c2a745a2bc21e8f439930f7c0e5d1521c2fd44c.tar.gz
gnupg-0c2a745a2bc21e8f439930f7c0e5d1521c2fd44c.zip
tests: Use gpgconf to set the ssh socket envvar.
* tests/openpgp/ssh.scm ("SSH_AUTH_SOCK"): Use gpgconf. Signed-off-by: Werner Koch <[email protected]>
-rwxr-xr-xtests/openpgp/ssh.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/openpgp/ssh.scm b/tests/openpgp/ssh.scm
index fe0b1150c..dfa1f5266 100755
--- a/tests/openpgp/ssh.scm
+++ b/tests/openpgp/ssh.scm
@@ -23,7 +23,9 @@
(if (string=? "" GNUPGHOME)
(error "GNUPGHOME not set"))
-(setenv "SSH_AUTH_SOCK" (path-join GNUPGHOME "S.gpg-agent.ssh") #t)
+(setenv "SSH_AUTH_SOCK"
+ (call-check `(,(tool 'gpgconf) --null --list-dirs agent-ssh-socket))
+ #t)
(define SSH-ADD #f)
(catch (skip "ssh-add not found")