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

t-runner: Add configurable max. test execution int

Browse Source
This commit is contained in:
Tim Kourt 2016-05-05 18:10:08 -07:00 committed by Denis Kenzior
parent ccc962d040
commit 9b339daeb9
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/test-runner.c
View File

@ -704,6 +704,7 @@ static bool find_test_configuration(const char *path, int level,
#define HW_CONFIG_SETUP_NUM_RADIOS "num_radios" #define HW_CONFIG_SETUP_NUM_RADIOS "num_radios"
#define HW_CONFIG_SETUP_RADIO_CONFS "radio_confs" #define HW_CONFIG_SETUP_RADIO_CONFS "radio_confs"
#define HW_CONFIG_SETUP_MAX_EXEC_SEC "max_test_exec_interval_sec"
static struct l_settings *read_hw_config(const char *test_dir_path) static struct l_settings *read_hw_config(const char *test_dir_path)
{ {
@ -1058,7 +1059,8 @@ static void signal_handler(struct l_signal *signal, uint32_t signo,
} }
} }
static pid_t start_execution_timeout_timer(pid_t *test_exec_pid) static pid_t start_execution_timeout_timer(unsigned int max_exec_interval_sec,
pid_t *test_exec_pid)
{ {
sigset_t mask; sigset_t mask;
struct l_signal *signal; struct l_signal *signal;
@ -1079,7 +1081,7 @@ static pid_t start_execution_timeout_timer(pid_t *test_exec_pid)
signal = l_signal_create(&mask, signal_handler, signal = l_signal_create(&mask, signal_handler,
test_exec_pid, NULL); test_exec_pid, NULL);
test_exec_timeout = test_exec_timeout =
l_timeout_create(TEST_MAX_EXEC_TIME_SEC, l_timeout_create(max_exec_interval_sec,
test_timeout_timer_tick, test_timeout_timer_tick,
test_exec_pid, test_exec_pid,
NULL); NULL);
@ -1095,16 +1097,23 @@ static pid_t start_execution_timeout_timer(pid_t *test_exec_pid)
return test_timer_pid; return test_timer_pid;
} }
static void run_py_tests(char *config_dir_path, struct l_queue *test_queue) static void run_py_tests(struct l_settings *hw_settings, char *config_dir_path,
struct l_queue *test_queue)
{ {
char *argv[3]; char *argv[3];
pid_t test_exec_pid, test_timer_pid; pid_t test_exec_pid, test_timer_pid;
struct timeval time_before, time_after, time_elapsed; struct timeval time_before, time_after, time_elapsed;
unsigned int max_exec_interval;
char *py_test = NULL; char *py_test = NULL;
if (!config_dir_path) if (!config_dir_path)
return; return;
if (!l_settings_get_uint(hw_settings, HW_CONFIG_GROUP_SETUP,
HW_CONFIG_SETUP_MAX_EXEC_SEC,
&max_exec_interval))
max_exec_interval = TEST_MAX_EXEC_TIME_SEC;
if (chdir(config_dir_path) < 0) if (chdir(config_dir_path) < 0)
l_error("Failed to change directory"); l_error("Failed to change directory");
else { else {
@ -1132,7 +1141,8 @@ start_next_test:
gettimeofday(&time_before, NULL); gettimeofday(&time_before, NULL);
test_timer_pid = start_execution_timeout_timer(&test_exec_pid); test_timer_pid = start_execution_timeout_timer(max_exec_interval,
&test_exec_pid);
while (true) { while (true) {
pid_t corpse; pid_t corpse;
@ -1234,7 +1244,7 @@ static void create_network_and_run_tests(const void *key, void *value,
/*TODO wait for iwd to obtain phyX - replace with dbus call*/ /*TODO wait for iwd to obtain phyX - replace with dbus call*/
sleep(2); sleep(2);
run_py_tests(config_dir_path, test_queue); run_py_tests(hw_settings, config_dir_path, test_queue);
terminate_iwd(iwd_pid); terminate_iwd(iwd_pid);