From 8c92f7e82fcdd2fb17c90ecdfea6134d7a8a8185 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Sun, 5 Apr 2020 18:46:42 +0200 Subject: sshserver.pl: use cached Win32 environment check variable --- tests/sshserver.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/sshserver.pl') diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 59ea0ae1e..084b4a83c 100644 --- a/tests/sshserver.pl +++ b/tests/sshserver.pl @@ -405,7 +405,7 @@ my $hstprvkeyf_config = abs_path("$path/$hstprvkeyf"); my $pidfile_config = $pidfile; my $sftpsrv_config = $sftpsrv; -if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') { +if (pathhelp::os_is_win()) { # Ensure to use MinGW/Cygwin paths $clipubkeyf_config = pathhelp::build_sys_abs_path($clipubkeyf_config); $hstprvkeyf_config = pathhelp::build_sys_abs_path($hstprvkeyf_config); @@ -797,7 +797,7 @@ if((! -e $knownhosts) || (! -s $knownhosts)) { my $identity_config = abs_path("$path/$identity"); my $knownhosts_config = abs_path("$path/$knownhosts"); -if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') { +if (pathhelp::os_is_win()) { # Ensure to use MinGW/Cygwin paths $identity_config = pathhelp::build_sys_abs_path($identity_config); $knownhosts_config = pathhelp::build_sys_abs_path($knownhosts_config); -- cgit v1.2.3