test-runner: run iwmon if --log is used
PATCH v2 1/2 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.
--- tools/test-runner.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
tools/test-runner.c +19 -0
@@ -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);
Signature · 1 line
2.17.1
PATCH v2 2/2 test-runner: fix logging directory name
localtime indexes month starting at zero so adding 1 gives us a folder name with the correct month.
The year is also set as 'years since 1900', so we need to add 1900 to the year to get the actual year.
--- tools/test-runner.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/test-runner.c +2 -2
@@ -3183,8 +3183,8 @@ int main(int argc, char *argv[]) log_uid =atoi (getenv ("SUDO_UID" ));snprintf (log_dir,sizeof (log_dir),"%s/run-%d-%d-%d-%d" , - optarg, timeinfo->tm_year, - timeinfo->tm_mon, timeinfo->tm_mday, + optarg, timeinfo->tm_year +1900 , + timeinfo->tm_mon +1 , timeinfo->tm_mday,getpid ());mkdir (log_dir,0755 );
Signature · 1 line
2.17.1
Hi James,
Quoted 7 lines · James Prestwood
Now that
execute_programhandles logging automatically its trivial to add iwmon to the test and get monitor logs as well as normal process output.--- tools/test-runner.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
Both applied, thanks.
Regards,
-Denis