Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 06:29:23 +01:00
Code Releases Activity

test-runner: Provide CONFIGURATION_DIRECTORY and STATE_DIRECTORY

Browse Source
This commit is contained in:
Marcel Holtmann 2019-09-08 18:12:51 +02:00
parent 7347bd4098
commit 9d1f7ad6f5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/test-runner.c
View File

@ -1398,7 +1398,7 @@ done:
static pid_t start_iwd(const char *config_dir, struct l_queue *wiphy_list, static pid_t start_iwd(const char *config_dir, struct l_queue *wiphy_list,
const char *ext_options, int num_phys) const char *ext_options, int num_phys)
{ {
char *argv[13]; char *argv[13], **envp;
char *iwd_phys = NULL; char *iwd_phys = NULL;
pid_t ret; pid_t ret;
int idx = 0; int idx = 0;
@ -1415,8 +1415,6 @@ static pid_t start_iwd(const char *config_dir, struct l_queue *wiphy_list,
} }
argv[idx++] = BIN_IWD; argv[idx++] = BIN_IWD;
argv[idx++] = "-c";
argv[idx++] = (char *) config_dir;
if (check_verbosity(BIN_IWD) || shell) if (check_verbosity(BIN_IWD) || shell)
argv[idx++] = "-d"; argv[idx++] = "-d";
@ -1459,9 +1457,17 @@ static pid_t start_iwd(const char *config_dir, struct l_queue *wiphy_list,
argv[idx++] = (char *)ext_options; argv[idx++] = (char *)ext_options;
argv[idx] = NULL; argv[idx] = NULL;
ret = execute_program(argv, environ, false, envp = l_strv_copy(environ);
envp = l_strv_append_printf(envp, "CONFIGURATION_DIRECTORY=%s",
config_dir);
envp = l_strv_append_printf(envp, "STATE_DIRECTORY=%s",
DAEMON_STORAGEDIR);
ret = execute_program(argv, envp, false,
check_verbosity(BIN_IWD), shell); check_verbosity(BIN_IWD), shell);
l_strv_free(envp);
if (iwd_phys) if (iwd_phys)
l_free(iwd_phys); l_free(iwd_phys);