MYNEWT-673 testbench reports some fails as passes
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/0d659e87 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0d659e87 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0d659e87 Branch: refs/heads/nrf_cputime Commit: 0d659e8762aa6626eeae69b9e2c154d44e85a4e8 Parents: c87fac5 Author: Christopher Collins <ccoll...@apache.org> Authored: Wed Mar 15 18:54:42 2017 -0700 Committer: Christopher Collins <ccoll...@apache.org> Committed: Wed Mar 15 18:54:42 2017 -0700 ---------------------------------------------------------------------- apps/testbench/src/testbench.c | 11 +++++------ apps/testbench/src/testbench_json.c | 5 ----- apps/testbench/src/testbench_mempool.c | 5 ----- apps/testbench/src/testbench_mutex.c | 20 ++------------------ apps/testbench/src/testbench_sem.c | 5 ++--- 5 files changed, 9 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0d659e87/apps/testbench/src/testbench.c ---------------------------------------------------------------------- diff --git a/apps/testbench/src/testbench.c b/apps/testbench/src/testbench.c index d97d397..b8fe034 100644 --- a/apps/testbench/src/testbench.c +++ b/apps/testbench/src/testbench.c @@ -127,18 +127,21 @@ void testbench_ts_pass(char *msg, int msg_len, void *arg) { TESTBENCH_UPDATE_TOD; + + total_tests++; LOG_INFO(&testlog, LOG_MODULE_TEST, "%s test case %s PASSED %s %s", buildID, tu_case_name, msg, runtest_token); - return; } void testbench_ts_fail(char *msg, int msg_len, void *arg) { TESTBENCH_UPDATE_TOD; + + total_tests++; + total_fails++; LOG_INFO(&testlog, LOG_MODULE_TEST, "%s test case %s FAILED %s %s", buildID, tu_case_name, msg, runtest_token); - return; } #if 0 @@ -209,8 +212,6 @@ testbench_runtests(struct os_event *ev) SLIST_FOREACH(ts, &g_ts_suites, ts_next) { if (run_all || !strcmp(runtest_arg->run_testname, ts->ts_name)) { ts->ts_test(); - total_tests += tu_case_idx; - total_fails += tu_case_failed; } } } else { @@ -219,8 +220,6 @@ testbench_runtests(struct os_event *ev) */ SLIST_FOREACH(ts, &g_ts_suites, ts_next) { ts->ts_test(); - total_tests += tu_case_idx; - total_fails += tu_case_failed; } } testbench_test_complete(); http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0d659e87/apps/testbench/src/testbench_json.c ---------------------------------------------------------------------- diff --git a/apps/testbench/src/testbench_json.c b/apps/testbench/src/testbench_json.c index 1d1cc8e..b750cd3 100644 --- a/apps/testbench/src/testbench_json.c +++ b/apps/testbench/src/testbench_json.c @@ -39,15 +39,10 @@ testbench_json_init(void *arg) LOG_DEBUG(&testlog, LOG_MODULE_TEST, "%s testbench json_init", buildID); - tu_case_idx = 0; - tu_case_failed = 0; - bigbuf = os_malloc(JSON_BIGBUF_SIZE); tu_suite_set_pass_cb(testbench_ts_pass, NULL); tu_suite_set_fail_cb(testbench_ts_fail, NULL); - - return; } void http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0d659e87/apps/testbench/src/testbench_mempool.c ---------------------------------------------------------------------- diff --git a/apps/testbench/src/testbench_mempool.c b/apps/testbench/src/testbench_mempool.c index 64b5f79..b7fc190 100644 --- a/apps/testbench/src/testbench_mempool.c +++ b/apps/testbench/src/testbench_mempool.c @@ -55,17 +55,12 @@ testbench_mempool_init(void *arg) LOG_DEBUG(&testlog, LOG_MODULE_TEST, "%s testbench mempool_init", buildID); - tu_case_idx = 0; - tu_case_failed = 0; - TstMembufSz = (sizeof(os_membuf_t) * OS_MEMPOOL_SIZE(NUM_MEM_BLOCKS, MEM_BLOCK_SIZE)); TstMembuf = os_malloc(TstMembufSz); tu_suite_set_pass_cb(testbench_ts_pass, NULL); tu_suite_set_fail_cb(testbench_ts_fail, NULL); - - return; } void http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0d659e87/apps/testbench/src/testbench_mutex.c ---------------------------------------------------------------------- diff --git a/apps/testbench/src/testbench_mutex.c b/apps/testbench/src/testbench_mutex.c index 59c8158..4998aeb 100644 --- a/apps/testbench/src/testbench_mutex.c +++ b/apps/testbench/src/testbench_mutex.c @@ -75,20 +75,6 @@ testbench_mutex_tc_posttest(void* arg) return; } -void -testbench_mutex_ts_pass(char *msg, int msg_len, void *arg) -{ - LOG_INFO(&testlog, LOG_MODULE_TEST, - "%s test case %s PASSED %s", buildID, tu_case_name, msg); -} - -void -testbench_mutex_ts_fail(char *msg, int msg_len, void *arg) -{ - LOG_INFO(&testlog, LOG_MODULE_TEST, - "%s test case %s FAILED %s", buildID, tu_case_name, msg); -} - /* * "Suspend" the test worker tasks after each test completes. * These tasks can be re-used for other tests, the stack also can be re-used. @@ -131,10 +117,8 @@ testbench_mutex_init(void *arg) LOG_DEBUG(&testlog, LOG_MODULE_TEST, "%s testbench test_init", buildID); - tu_suite_set_pass_cb(testbench_mutex_ts_pass, NULL); - tu_suite_set_fail_cb(testbench_mutex_ts_fail, NULL); - - return; + tu_suite_set_pass_cb(testbench_ts_pass, NULL); + tu_suite_set_fail_cb(testbench_ts_fail, NULL); } TEST_CASE_DECL(os_mutex_test_basic) http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0d659e87/apps/testbench/src/testbench_sem.c ---------------------------------------------------------------------- diff --git a/apps/testbench/src/testbench_sem.c b/apps/testbench/src/testbench_sem.c index a14a36f..e570da5 100644 --- a/apps/testbench/src/testbench_sem.c +++ b/apps/testbench/src/testbench_sem.c @@ -72,12 +72,11 @@ testbench_sem_init(void *arg) tu_case_idx = 0; tu_case_failed = 0; - LOG_DEBUG(&testlog, LOG_MODULE_TEST, "%s testbench_sem suite init", buildID); + LOG_DEBUG(&testlog, LOG_MODULE_TEST, "%s testbench_sem suite init", + buildID); tu_suite_set_pass_cb(testbench_ts_pass, NULL); tu_suite_set_fail_cb(testbench_ts_fail, NULL); - - return; } TEST_CASE(os_sem_test_null)