shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

tests: Add condition for SSHD_EXECUTABLE

Browse Source 
Do not compile tests which need SSHD_EXECUTABLE when
it is not available

Signed-off-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Norbert Pocs
2021-11-04 10:49:20 +01:00
committed by Jakub Jelen
parent ce26b56e13
commit 21b6418fd9
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/torture.c
View File

@@ -722,6 +722,7 @@ void torture_setup_create_libssh_config(void **state)
torture_write_file(s->srv_config, sshd_config); torture_write_file(s->srv_config, sshd_config);
} }
#ifdef SSHD_EXECUTABLE
static void torture_setup_create_sshd_config(void **state, bool pam) static void torture_setup_create_sshd_config(void **state, bool pam)
{ {
struct torture_state *s = *state; struct torture_state *s = *state;
@@ -1145,25 +1146,6 @@ void torture_setup_sshd_server(void **state, bool pam)
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
} }
void torture_setup_tokens(const char *temp_dir,
const char *filename,
const char object_name[],
const char *load_public)
{
char token_setup_start_cmd[1024] = {0};
int rc;
snprintf(token_setup_start_cmd, sizeof(token_setup_start_cmd),
"%s/tests/pkcs11/setup-softhsm-tokens.sh %s %s %s %s",
BINARYDIR,
temp_dir,
filename,
object_name, load_public);
rc = system(token_setup_start_cmd);
assert_return_code(rc, errno);
}
void torture_teardown_socket_dir(void **state) void torture_teardown_socket_dir(void **state)
{ {
struct torture_state *s = *state; struct torture_state *s = *state;
@@ -1245,6 +1227,26 @@ void torture_teardown_sshd_server(void **state)
torture_teardown_socket_dir(state); torture_teardown_socket_dir(state);
} }
#endif /* SSHD_EXECUTABLE */
void torture_setup_tokens(const char *temp_dir,
const char *filename,
const char object_name[],
const char *load_public)
{
char token_setup_start_cmd[1024] = {0};
int rc;
snprintf(token_setup_start_cmd, sizeof(token_setup_start_cmd),
"%s/tests/pkcs11/setup-softhsm-tokens.sh %s %s %s %s",
BINARYDIR,
temp_dir,
filename,
object_name, load_public);
rc = system(token_setup_start_cmd);
assert_return_code(rc, errno);
}
char *torture_make_temp_dir(const char *template) char *torture_make_temp_dir(const char *template)
{ {

11
tests/torture.h
View File

@@ -124,17 +124,20 @@ void _torture_filter_tests(struct CMUnitTest *tests, size_t ntests);
const char *torture_server_address(int domain); const char *torture_server_address(int domain);
int torture_server_port(void); int torture_server_port(void);
#ifdef SSHD_EXECUTABLE
void torture_setup_socket_dir(void **state); void torture_setup_socket_dir(void **state);
void torture_setup_sshd_server(void **state, bool pam); void torture_setup_sshd_server(void **state, bool pam);
void torture_setup_tokens(const char *temp_dir,
const char *filename,
const char object_name[],
const char *load_public);
void torture_teardown_socket_dir(void **state); void torture_teardown_socket_dir(void **state);
void torture_teardown_sshd_server(void **state); void torture_teardown_sshd_server(void **state);
int torture_update_sshd_config(void **state, const char *config); int torture_update_sshd_config(void **state, const char *config);
#endif /* SSHD_EXECUTABLE */
void torture_setup_tokens(const char *temp_dir,
const char *filename,
const char object_name[],
const char *load_public);
void torture_reset_config(ssh_session session); void torture_reset_config(ssh_session session);