diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2017-04-12 09:48:10 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-06-23 00:51:19 -0700 |
commit | ff85876719777d7e375368f73ec0c150a134f291 (patch) | |
tree | ac78df3efe0c1d353a95ac0a2c18aca3b08b9168 /cts/task | |
parent | 60800678ca1a7454a20ae2c270a4ea0bda34b9c0 (diff) | |
download | chrome-ec-ff85876719777d7e375368f73ec0c150a134f291.tar.gz |
eCTS: Check order and expectation of test results
This patch makes the framework verify not only the result but also
the execution order of the tests. It also allows each test to
specify expected return code and strings printed by TH and DUT.
The final test results depends on the return code and the expectation.
Therefore, the output now includes 'RESULT' column showing PASS or FAIL:
test name TH_RETURN_CODE DUT_RETURN_CODE TH_STR DUT_STR RESULT
test_task_switch SUCCESS SUCCESS 1 1 PASS
test_task_priority SUCCESS FAILURE 1 1 FAIL
test_stack_overflow DID_NOT_END DID_NOT_END 1 1 PASS
Additionally, this patch:
* Adds CTS_RC_DID_NOT_START and CTS_RC_DID_NOT_END to indicate whether
the test did start or end, respectively.
* Makes stack overflow test check whether stack overflow was detected
and reboot occurred
* Removes post_corruption_test and conflict test since now
the test results are stricly compared against expected results.
* Fixes gpylint errors.
BUG=none
BRANCH=none
TEST=Run gpio, meta, timer, interrupt, and cts/cts.py -m task
Change-Id: I3b7005236e705dcac0c8f4711b44c85ff9a4f676
Reviewed-on: https://chromium-review.googlesource.com/538878
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'cts/task')
-rw-r--r-- | cts/task/cts.testlist | 9 | ||||
-rw-r--r-- | cts/task/dut.c | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/cts/task/cts.testlist b/cts/task/cts.testlist index 25dbcc313a..c4b7bc3231 100644 --- a/cts/task/cts.testlist +++ b/cts/task/cts.testlist @@ -9,18 +9,19 @@ * repeated TEST_COUNT times. It's expected all tasks to run exactly * TEST_COUNT times. Tick task runs to inject some irregularity. */ -CTS_TEST(test_task_switch) +CTS_TEST(test_task_switch,,,,) /* * Test task priority. CTS task wakes up A and C then goes to sleep. Since C * has a higher priority, C should run first. This should result in C running * one more time than A (or B). */ -CTS_TEST(test_task_priority) +CTS_TEST(test_task_priority,,,,) /* * Test stack overflow. CTS task overflows the stack and it should be detected * when task switch happens. Reboot is expected. - * TODO: Verify stack overflow detection and reboot. */ -CTS_TEST(test_stack_overflow)
\ No newline at end of file +CTS_TEST(test_stack_overflow,\ + CTS_RC_DID_NOT_END, "Stack overflow in CTS task!",\ + CTS_RC_DID_NOT_END, "Stack overflow in CTS task!") diff --git a/cts/task/dut.c b/cts/task/dut.c index e34dd0babb..4cc6e3e4a4 100644 --- a/cts/task/dut.c +++ b/cts/task/dut.c @@ -125,19 +125,14 @@ static void recurse(int x) CPRINTS("-%d", x); } -enum cts_rc test_stack_overflow(void); - -#include "cts_testlist.h" - enum cts_rc test_stack_overflow(void) { - /* recurse() is expected to overflow the stack, which leads to reboot. - * So, we print output proactively. */ - CPRINTF("\n%s %d\n", tests[CTS_TEST_ID_COUNT - 1].name, CTS_RC_SUCCESS); recurse(0); return CTS_RC_FAILURE; } +#include "cts_testlist.h" + void cts_task(void) { enum cts_rc rc; @@ -147,8 +142,9 @@ void cts_task(void) for (i = 0; i < CTS_TEST_ID_COUNT; i++) { clear_state(); + CPRINTF("\n%s start\n", tests[i].name); rc = tests[i].run(); - CPRINTF("\n%s %d\n", tests[i].name, rc); + CPRINTF("\n%s end %d\n", tests[i].name, rc); cflush(); } |