From 61c2290a24a1be5df0d75a58926a030d766dba09 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Thu, 29 Oct 2015 15:06:04 +0300 Subject: tests/server.scm: Use (tests common) * tests/server.scm: Use (tests common). Replace ad-hoc key pathes with constants from (tests common). --- tests/server.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'tests/server.scm') diff --git a/tests/server.scm b/tests/server.scm index 3ce475f..8e61e0a 100644 --- a/tests/server.scm +++ b/tests/server.scm @@ -17,8 +17,12 @@ ;; You should have received a copy of the GNU General Public License ;; along with Guile-SSH. If not, see . +(add-to-load-path (getenv "abs_top_srcdir")) + (use-modules (srfi srfi-64) - (ssh server)) + (ssh server) + ;; Helper procedures + (tests common)) (test-begin "server") @@ -43,8 +47,8 @@ (options `((bindaddr "127.0.0.1") (bindport 22) (hostkey "ssh-rsa" "ssh-dss") - (rsakey ,(format #f "~a/tests/rsakey" topdir)) - (dsakey ,(format #f "~a/tests/dsakey" topdir)) + (rsakey ,%rsakey) + (dsakey ,%dsakey) (banner "string") (log-verbosity nolog rare protocol packet functions) (blocking-mode #f #t))) @@ -108,8 +112,8 @@ (let ((topdir (getenv "abs_top_srcdir"))) (make-server #:bindaddr "127.0.0.1" #:bindport 123456 - #:rsakey (format #f "~a/tests/rsakey" topdir) - #:dsakey (format #f "~a/tests/dsakey" topdir) + #:rsakey %rsakey + #:dsakey %dsakey #:banner "banner" #:log-verbosity 'nolog #:blocking-mode #f))) @@ -118,8 +122,8 @@ (let* ((topdir (getenv "abs_top_srcdir")) (bindaddr "127.0.0.1") (bindport 123456) - (rsakey (format #f "~a/tests/rsakey" topdir)) - (dsakey (format #f "~a/tests/dsakey" topdir)) + (rsakey %rsakey) + (dsakey %dsakey) (banner "banner") (log-verbosity 'nolog) (blocking-mode #f) @@ -142,7 +146,7 @@ (let* ((topdir (getenv "abs_top_srcdir")) (server (make-server #:bindaddr "127.0.0.1" #:bindport 123456 - #:rsakey (format #f "~a/tests/rsakey" topdir) + #:rsakey %rsakey #:log-verbosity 'nolog))) (server-listen server) #t)) -- cgit v1.2.3