aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2019-10-20 00:52:47 +0200
committerAndreas Schneider <asn@cryptomilk.org>2019-12-23 14:31:32 +0100
commit1089948346640061e3a723737cfdd8515d4986d5 (patch)
tree317c8c95f24cc91428475b2a868d32b071cbf2c0
parent7ec67011c5bb9cf700a76084550b095640605c85 (diff)
downloadlibssh-1089948346640061e3a723737cfdd8515d4986d5.tar.gz
libssh-1089948346640061e3a723737cfdd8515d4986d5.tar.xz
libssh-1089948346640061e3a723737cfdd8515d4986d5.zip
tests: use detected sshd path
The static sshd directory wasn't matching the detected sshd and prevented the testcases to be run against local OpenSSH builts Signed-off-by: Aris Adamantiadis <aris@0xbadc0de.be> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--tests/CMakeLists.txt16
-rw-r--r--tests/tests_config.h.cmake1
-rw-r--r--tests/torture.c2
3 files changed, 10 insertions, 9 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 20e42f1a..68b045bd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -104,23 +104,23 @@ if (SSH_EXECUTABLE)
endif()
+find_program(SSHD_EXECUTABLE
+ NAME
+ sshd
+ PATHS
+ /sbin
+ /usr/sbin
+ /usr/local/sbin)
+
if (CLIENT_TESTING OR SERVER_TESTING)
find_package(socket_wrapper 1.1.5 REQUIRED)
find_package(nss_wrapper 1.1.2 REQUIRED)
find_package(uid_wrapper 1.2.0 REQUIRED)
find_package(pam_wrapper 1.0.1 REQUIRED)
- find_program(SSHD_EXECUTABLE
- NAME
- sshd
- PATHS
- /sbin
- /usr/sbin
- /usr/local/sbin)
if (NOT SSHD_EXECUTABLE)
message(SEND_ERROR "Could not find sshd which is required for client testing")
endif()
-
find_program(NC_EXECUTABLE
NAME
nc
diff --git a/tests/tests_config.h.cmake b/tests/tests_config.h.cmake
index ffaff946..c2c548be 100644
--- a/tests/tests_config.h.cmake
+++ b/tests/tests_config.h.cmake
@@ -65,3 +65,4 @@
/* Available programs */
#cmakedefine NC_EXECUTABLE "${NC_EXECUTABLE}"
+#cmakedefine SSHD_EXECUTABLE "${SSHD_EXECUTABLE}" \ No newline at end of file
diff --git a/tests/torture.c b/tests/torture.c
index 943486c2..4783d9cf 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -841,7 +841,7 @@ void torture_setup_sshd_server(void **state, bool pam)
s = *state;
snprintf(sshd_start_cmd, sizeof(sshd_start_cmd),
- "/usr/sbin/sshd -r -f %s -E %s/sshd/daemon.log 2> %s/sshd/cwrap.log",
+ SSHD_EXECUTABLE " -r -f %s -E %s/sshd/daemon.log 2> %s/sshd/cwrap.log",
s->srv_config, s->socket_dir, s->socket_dir);
rc = system(sshd_start_cmd);