aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <justus@g10code.com>2016-03-16 12:32:29 +0100
committerAndreas Schneider <asn@cryptomilk.org>2018-10-05 12:09:45 +0200
commitc0be59f876adb3e7fc2a7838ddc182dcc391a293 (patch)
treedbb8bbd251681301154e0c237def9fba2bf63a9e
parent2983b21996dda7636e81f1af790e6486c2524192 (diff)
downloadlibssh-c0be59f876adb3e7fc2a7838ddc182dcc391a293.tar.gz
libssh-c0be59f876adb3e7fc2a7838ddc182dcc391a293.tar.xz
libssh-c0be59f876adb3e7fc2a7838ddc182dcc391a293.zip
tests: Make test suite work out of the box on Debian
* tests/torture.c (torture_setup_create_sshd_config): Rework how the location of the sftp server is discovered, and add the Debian-specific location. Signed-off-by: Justus Winter <justus@g10code.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org> (cherry-picked from commit e37fd832)
-rw-r--r--tests/torture.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/tests/torture.c b/tests/torture.c
index c5f57a1f..c58e3055 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -753,7 +753,15 @@ static void torture_setup_create_sshd_config(void **state)
char sshd_config[2048];
char sshd_path[1024];
struct stat sb;
+ const char *sftp_server_locations[] = {
+ "/usr/lib/ssh/sftp-server",
+ "/usr/libexec/sftp-server",
+ "/usr/libexec/openssh/sftp-server",
+ "/usr/lib/openssh/sftp-server", /* Debian */
+ };
+ size_t sftp_sl_size = ARRAY_SIZE(sftp_server_locations);
const char *sftp_server;
+ size_t i;
int rc;
snprintf(sshd_path,
@@ -785,16 +793,13 @@ static void torture_setup_create_sshd_config(void **state)
assert_non_null(s->socket_dir);
- sftp_server = "/usr/lib/ssh/sftp-server";
- rc = lstat(sftp_server, &sb);
- if (rc < 0) {
- sftp_server = "/usr/libexec/sftp-server";
- rc = lstat(sftp_server, &sb);
- if (rc < 0) {
- sftp_server = "/usr/libexec/openssh/sftp-server";
+ sftp_server = getenv("TORTURE_SFTP_SERVER");
+ if (sftp_server == NULL) {
+ for (i = 0; i < sftp_sl_size; i++) {
+ sftp_server = sftp_server_locations[i];
rc = lstat(sftp_server, &sb);
- if (rc < 0) {
- sftp_server = getenv("TORTURE_SFTP_SERVER");
+ if (rc == 0) {
+ break;
}
}
}