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

Adapt Harness to call init and run functions.

Niklas Hauser 2016-04-05 16:55:46 +01:00 committed by Martin Kojtal
parent df1d9f5529
commit 53377a1f4a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,14 +84,14 @@ static void die() {
bool Harness::set_scheduler(const utest_v1_scheduler_t scheduler) bool Harness::set_scheduler(const utest_v1_scheduler_t scheduler)
{ {
if (!scheduler.post || !scheduler.cancel) if (!scheduler.init || !scheduler.post || !scheduler.cancel || !scheduler.run)
return false; return false;
::scheduler = scheduler; ::scheduler = scheduler;
return true; return true;
} }
bool Harness::run(const Specification& specification, std::size_t) bool Harness::run(const Specification& specification, size_t)
{ {
return run(specification); return run(specification);
} }
@ -102,7 +102,10 @@ bool Harness::run(const Specification& specification)
if (is_busy()) if (is_busy())
return false; return false;
if (!scheduler.post || !scheduler.cancel) if (!scheduler.init || !scheduler.post || !scheduler.cancel || !scheduler.run)
return false;
if (scheduler.init() != 0)
return false; return false;
test_cases = specification.cases; test_cases = specification.cases;
@ -143,6 +146,14 @@ bool Harness::run(const Specification& specification)
case_current = &test_cases[case_index]; case_current = &test_cases[case_index];
scheduler.post(run_next_case, 0); scheduler.post(run_next_case, 0);
if (scheduler.run() != 0) {
failure.reason = REASON_SCHEDULER;
if (handlers.test_failure) handlers.test_failure(failure);
if (handlers.test_teardown) handlers.test_teardown(0, 0, failure);
test_cases = NULL;
exit(1);
return true;
}
return true; return true;
} }