ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Types: Add repeat count to `control_flow_handler_t`.

Niklas Hauser 2015-11-16 11:09:19 +00:00 committed by Martin Kojtal
parent b3e30294cc
commit e77743d6a6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frameworks\utest/source/harness.cpp
View File

@ -35,6 +35,7 @@ namespace
const Case *case_current = NULL; const Case *case_current = NULL;
control_flow_t case_control_flow = CONTROL_FLOW_NEXT; control_flow_t case_control_flow = CONTROL_FLOW_NEXT;
size_t case_repeat_count = 0;
minar::callback_handle_t case_timeout_handle = NULL; minar::callback_handle_t case_timeout_handle = NULL;
@ -120,6 +121,7 @@ void Harness::schedule_next_case()
case_passed = 0; case_passed = 0;
case_failed = 0; case_failed = 0;
case_failed_before = 0; case_failed_before = 0;
case_repeat_count = 0;
} }
minar::Scheduler::postCallback(run_next_case); minar::Scheduler::postCallback(run_next_case);
} }
@ -152,7 +154,7 @@ void Harness::run_next_case()
{ {
util::CriticalSectionLock lock; util::CriticalSectionLock lock;
if(case_current != (test_cases + test_length)) if(case_current < (test_cases + test_length))
{ {
handlers.case_set_up = defaults.get_handler(case_current->set_up_handler); handlers.case_set_up = defaults.get_handler(case_current->set_up_handler);
handlers.case_tear_down = defaults.get_handler(case_current->tear_down_handler); handlers.case_tear_down = defaults.get_handler(case_current->tear_down_handler);
@ -179,7 +181,8 @@ void Harness::run_next_case()
case_control_flow = CONTROL_FLOW_NEXT; case_control_flow = CONTROL_FLOW_NEXT;
case_current->handler(); case_current->handler();
} else if (case_current->control_flow_handler) { } else if (case_current->control_flow_handler) {
case_control_flow = case_current->control_flow_handler(); case_control_flow = case_current->control_flow_handler(case_repeat_count);
case_repeat_count++;
} }
if (case_current->timeout_ms >= 0) { if (case_current->timeout_ms >= 0) {