mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-12-22 04:32:37 +01:00
test-runner: run iwmon if --log is used
Now that execute_program handles logging automatically its trivial to add iwmon to the test and get monitor logs as well as normal process output.
This commit is contained in:
parent
5709a4afcf
commit
2a2f60d86b
@ -1592,6 +1592,18 @@ static void terminate_iwd(pid_t iwd_pid)
|
||||
kill_process(iwd_pid);
|
||||
}
|
||||
|
||||
static pid_t start_monitor(const char *test_name)
|
||||
{
|
||||
char *argv[4];
|
||||
|
||||
argv[0] = "iwmon";
|
||||
argv[1] = "--nortnl";
|
||||
argv[2] = "--nowiphy";
|
||||
argv[3] = NULL;
|
||||
|
||||
return execute_program(argv, environ, false, test_name);
|
||||
}
|
||||
|
||||
static bool create_tmpfs_extra_stuff(char **tmpfs_extra_stuff)
|
||||
{
|
||||
size_t i = 0;
|
||||
@ -2004,6 +2016,7 @@ static void create_network_and_run_tests(void *data, void *user_data)
|
||||
pid_t medium_pid = -1;
|
||||
pid_t ofono_pid = -1;
|
||||
pid_t phonesim_pid = -1;
|
||||
pid_t monitor_pid = -1;
|
||||
char *config_dir_path;
|
||||
char *iwd_config_dir;
|
||||
char **tmpfs_extra_stuff = NULL;
|
||||
@ -2149,6 +2162,9 @@ static void create_network_and_run_tests(void *data, void *user_data)
|
||||
l_queue_foreach(wiphy_list, wiphy_up, NULL);
|
||||
}
|
||||
|
||||
if (log)
|
||||
monitor_pid = start_monitor(test_name);
|
||||
|
||||
if (check_verbosity("tls"))
|
||||
setenv("IWD_TLS_DEBUG", "on", true);
|
||||
|
||||
@ -2233,6 +2249,9 @@ static void create_network_and_run_tests(void *data, void *user_data)
|
||||
stop_phonesim(phonesim_pid);
|
||||
}
|
||||
|
||||
if (monitor_pid > 0)
|
||||
kill_process(monitor_pid);
|
||||
|
||||
exit_hostapd:
|
||||
destroy_hostapd_instances(hostapd_pids);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user