aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelen <jjelen@redhat.com>2019-11-21 17:02:29 +0100
committerAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2020-08-13 17:35:09 +0200
commitd4b07d16751b6a0b262b0259702954ee3684362a (patch)
treead49a66b584350e08a39e3bd556259af8487f63f
parentd462cc30c99c9b0aacda7836e90d0feade9f9486 (diff)
downloadlibssh-d4b07d16751b6a0b262b0259702954ee3684362a.tar.gz
libssh-d4b07d16751b6a0b262b0259702954ee3684362a.tar.xz
libssh-d4b07d16751b6a0b262b0259702954ee3684362a.zip
tests: Use the path to SSH executable consistently
Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org> (cherry picked from commit 2892b49a37e742cc6089c87cab6a89340a2e33a4)
-rw-r--r--tests/client/torture_rekey.c4
-rw-r--r--tests/client/torture_sftp_read.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/client/torture_rekey.c b/tests/client/torture_rekey.c
index 7c9d8127..a70b39d6 100644
--- a/tests/client/torture_rekey.c
+++ b/tests/client/torture_rekey.c
@@ -283,7 +283,7 @@ static void torture_rekey_recv(void **state)
memcpy(secret_hash, c->secret_hash, c->digest_len);
/* Download a file */
- file = sftp_open(s->ssh.tsftp->sftp, "/usr/bin/ssh", O_RDONLY, 0);
+ file = sftp_open(s->ssh.tsftp->sftp, SSH_EXECUTABLE, O_RDONLY, 0);
assert_non_null(file);
mask = umask(S_IRWXO | S_IRWXG);
@@ -473,7 +473,7 @@ static void torture_rekey_server_recv(void **state)
memcpy(secret_hash, c->secret_hash, c->digest_len);
/* Download a file */
- file = sftp_open(s->ssh.tsftp->sftp, "/usr/bin/ssh", O_RDONLY, 0);
+ file = sftp_open(s->ssh.tsftp->sftp, SSH_EXECUTABLE, O_RDONLY, 0);
assert_non_null(file);
mask = umask(S_IRWXO | S_IRWXG);
diff --git a/tests/client/torture_sftp_read.c b/tests/client/torture_sftp_read.c
index 2208fbae..687153eb 100644
--- a/tests/client/torture_sftp_read.c
+++ b/tests/client/torture_sftp_read.c
@@ -73,7 +73,7 @@ static void torture_sftp_read_blocking(void **state) {
sftp_file file;
mode_t mask;
- file = sftp_open(t->sftp, "/usr/bin/ssh", O_RDONLY, 0);
+ file = sftp_open(t->sftp, SSH_EXECUTABLE, O_RDONLY, 0);
assert_non_null(file);
mask = umask(S_IRWXO | S_IRWXG);