diff options
| author | Artyom V. Poptsov <poptsov.artyom@gmail.com> | 2015-10-29 15:20:39 +0300 |
|---|---|---|
| committer | Artyom V. Poptsov <poptsov.artyom@gmail.com> | 2015-10-29 15:20:39 +0300 |
| commit | 99796a31ef53fc2f6027f60d7e78a69903dce867 (patch) | |
| tree | 167e4c07b243502231d037fa9441c2886a6eec73 /tests/sssh-ssshd.scm | |
| parent | tests/sssh-ssshd.scm: Use (tests common) (diff) | |
| download | guile-ssh-99796a31ef53fc2f6027f60d7e78a69903dce867.tar.gz | |
tests/sssh-ssshd.scm: Remove extra global variables
* tests/sssh-ssshd.scm: Remove extra global variables; use constants from
(tests common).
Diffstat (limited to 'tests/sssh-ssshd.scm')
| -rw-r--r-- | tests/sssh-ssshd.scm | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tests/sssh-ssshd.scm b/tests/sssh-ssshd.scm index ce04ca8..910e3a5 100644 --- a/tests/sssh-ssshd.scm +++ b/tests/sssh-ssshd.scm @@ -31,10 +31,6 @@ ;;; -(define *topdir* %topdir) -(define *rsakey* %rsakey) -(define *dsakey* %dsakey) - (define *test-cmd* "uname --all") (define *srv-address* INADDR_LOOPBACK) @@ -43,22 +39,22 @@ (define *ssshd-cmd* (string-append - *topdir* "/examples/ssshd.scm --detach" + %topdir "/examples/ssshd.scm --detach" " --pid-file=" *srv-pid-file* " --port=" (number->string *srv-port*) - " --rsakey=" *rsakey* - " --dsakey=" *dsakey*)) + " --rsakey=" %rsakey + " --dsakey=" %dsakey)) (define *sssh-cmd* (string-append - *topdir* "/examples/sssh.scm" - " --identity-file=" *rsakey* + %topdir "/examples/sssh.scm" + " --identity-file=" %rsakey " --port=" (number->string *srv-port*) " --known-hosts-file=" %knownhosts " " (inet-ntoa *srv-address*) " '" *test-cmd* "'")) -(setenv "GUILE_LOAD_PATH" (string-append *topdir* "/modules")) +(setenv "GUILE_LOAD_PATH" (string-append %topdir "/modules")) ;; We must unset `SSH_AUTH_SOCK' to prevent sssh from asking SSH agent ;; (if it is present) for keys. |