diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2019-10-20 00:52:47 +0200 |
---|---|---|
committer | Anderson Toshiyuki Sasaki <ansasaki@redhat.com> | 2020-08-13 17:35:09 +0200 |
commit | 6a1dc7df87b85c8692aa6b99f1a02c09f1552103 (patch) | |
tree | 143d9e8a05250bd82763ed5b75078483fc1cd4e0 | |
parent | 41e54ce0421abeb4fa73e5451483be8e7b7088e3 (diff) | |
download | libssh-6a1dc7df87b85c8692aa6b99f1a02c09f1552103.tar.gz libssh-6a1dc7df87b85c8692aa6b99f1a02c09f1552103.tar.xz libssh-6a1dc7df87b85c8692aa6b99f1a02c09f1552103.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>
(cherry picked from commit 1089948346640061e3a723737cfdd8515d4986d5)
-rw-r--r-- | tests/CMakeLists.txt | 16 | ||||
-rw-r--r-- | tests/tests_config.h.cmake | 1 | ||||
-rw-r--r-- | tests/torture.c | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6df750c7..b668d3d7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -105,23 +105,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 cd1c5bd4..188e1427 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -845,7 +845,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); |