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

Fixed premature validation attribute modification.

Niklas Hauser 2015-12-22 18:08:20 +00:00 committed by Martin Kojtal
parent 7f9f0d81ab
commit 5a052a523a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,6 +183,7 @@ void Harness::validate_callback(const control_t control)
case_timeout_handle = NULL;
control_t merged_control = case_control + control;
case_control.repeat = repeat_t(merged_control.repeat & ~REPEAT_ON_TIMEOUT);
case_control.timeout = TIMEOUT_NONE;
minar::Scheduler::postCallback(schedule_next_case);
}
}
@ -210,14 +211,16 @@ void Harness::run_next_case()
return;
}
repeat_t setup_repeat;
{
mbed::util::CriticalSectionLock lock;
case_validation_count = 0;
case_timeout_occurred = false;
setup_repeat = case_control.repeat;
case_control = control_t();
}
if (case_control.repeat & REPEAT_SETUP_TEARDOWN) {
case_control = control_t();
if (setup_repeat & REPEAT_SETUP_TEARDOWN) {
if (handlers.case_setup && (handlers.case_setup(case_current, test_index_of_case) != STATUS_CONTINUE)) {
raise_failure(FAILURE_SETUP);
schedule_next_case();
@ -230,9 +233,9 @@ void Harness::run_next_case()
if (case_current->handler) {
case_current->handler();
} else if (case_current->control_handler) {
case_control = case_current->control_handler();
case_control = case_control + case_current->control_handler();
} else if (case_current->repeat_count_handler) {
case_control = case_current->repeat_count_handler(case_repeat_count);
case_control = case_control + case_current->repeat_count_handler(case_repeat_count);
}
case_repeat_count++;

1
frameworks\utest/utest/types.h
View File

@ -293,6 +293,7 @@ namespace v1 {
* @returns
* You can return `STATUS_ABORT` to indicate that this failure is non-recoverable, which will call the case
* teardown handler with reason. If a failure occurs during teardown, the teardown will not be called again.
* You may return `STATUS_IGNORE` which will cause the harness to ignore and not count the failure.
*/
typedef status_t (*case_failure_handler_t)(const Case *const source, const failure_t reason);