Log json test results and assume msg is null terminated
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/fcb79cd9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/fcb79cd9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/fcb79cd9 Branch: refs/heads/nrf_cputime Commit: fcb79cd91206aaebaf138f8c99fdd87e6aa30d40 Parents: d7a9e96 Author: spoonofpower <spoonofpo...@gmail.com> Authored: Fri Mar 17 13:52:07 2017 -0700 Committer: spoonofpower <spoonofpo...@gmail.com> Committed: Fri Mar 17 13:52:07 2017 -0700 ---------------------------------------------------------------------- apps/testbench/src/testbench.c | 25 ++++++++++++++++--------- apps/testbench/src/testbench.h | 4 ++-- test/testutil/include/testutil/testutil.h | 2 +- test/testutil/src/case.c | 9 +++------ 4 files changed, 22 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/fcb79cd9/apps/testbench/src/testbench.c ---------------------------------------------------------------------- diff --git a/apps/testbench/src/testbench.c b/apps/testbench/src/testbench.c index 19b0ebf..bb96a7a 100644 --- a/apps/testbench/src/testbench.c +++ b/apps/testbench/src/testbench.c @@ -124,24 +124,30 @@ extern uint32_t stack3_size; extern uint32_t stack4_size; void -testbench_ts_pass(char *msg, int msg_len, void *arg) +testbench_ts_result(char *msg, void *arg, bool passed) { 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); + if (!passed) { + total_fails++; + } + + LOG_INFO(&testlog, LOG_MODULE_TEST, + "{\"k\":\"%s\",\"n\":\"%s\",\"r\":%d,\"m\":\"%s\"}", + runtest_token, tu_case_name, passed, msg); } void -testbench_ts_fail(char *msg, int msg_len, void *arg) +testbench_ts_pass(char *msg, void *arg) { - TESTBENCH_UPDATE_TOD; + testbench_ts_result(msg, arg, true); +} - total_tests++; - total_fails++; - LOG_INFO(&testlog, LOG_MODULE_TEST, "%s test case %s FAILED %s %s", - buildID, tu_case_name, msg, runtest_token); +void +testbench_ts_fail(char *msg, void *arg) +{ + testbench_ts_result(msg, arg, false); } #if 0 @@ -234,6 +240,7 @@ testbench_runtests(struct os_event *ev) static void testbench_test_complete() { + LOG_INFO(&testlog, LOG_MODULE_TEST, "%s Done", runtest_token); LOG_INFO(&testlog, LOG_MODULE_TEST, "%s TESTBENCH TEST %s - Tests run:%d pass:%d fail:%d %s", buildID, http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/fcb79cd9/apps/testbench/src/testbench.h ---------------------------------------------------------------------- diff --git a/apps/testbench/src/testbench.h b/apps/testbench/src/testbench.h index a94ee1c..ad47ae3 100644 --- a/apps/testbench/src/testbench.h +++ b/apps/testbench/src/testbench.h @@ -156,8 +156,8 @@ extern os_stack_t *stack4; void testbench_ts_init(void *arg); void testbench_ts_pretest(void* arg); void testbench_ts_posttest(void* arg); -void testbench_ts_pass(char *msg, int msg_len, void *arg); -void testbench_ts_fail(char *msg, int msg_len, void *arg); +void testbench_ts_pass(char *msg, void *arg); +void testbench_ts_fail(char *msg, void *arg); void testbench_tc_pretest(void* arg); void testbench_tc_postest(void* arg); http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/fcb79cd9/test/testutil/include/testutil/testutil.h ---------------------------------------------------------------------- diff --git a/test/testutil/include/testutil/testutil.h b/test/testutil/include/testutil/testutil.h index 1edfb03..56f8f64 100644 --- a/test/testutil/include/testutil/testutil.h +++ b/test/testutil/include/testutil/testutil.h @@ -48,7 +48,7 @@ extern "C" { * tu_suite_complete -> ts_suite_complete_cb */ -typedef void tu_case_report_fn_t(char *msg, int msg_len, void *arg); +typedef void tu_case_report_fn_t(char *msg, void *arg); typedef void tu_suite_restart_fn_t(void *arg); typedef void tu_init_test_fn_t(void *arg); http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/fcb79cd9/test/testutil/src/case.c ---------------------------------------------------------------------- diff --git a/test/testutil/src/case.c b/test/testutil/src/case.c index 060f00c..2727b99 100644 --- a/test/testutil/src/case.c +++ b/test/testutil/src/case.c @@ -169,8 +169,7 @@ tu_case_pass(void) tu_case_failed = 0; if (ts_config.ts_case_pass_cb != NULL) { - ts_config.ts_case_pass_cb(tu_case_buf, tu_case_buf_len, - ts_config.ts_case_pass_arg); + ts_config.ts_case_pass_cb(tu_case_buf, ts_config.ts_case_pass_arg); } } @@ -192,8 +191,7 @@ tu_case_fail(void) tu_case_post_test(); if (ts_config.ts_case_fail_cb != NULL) { - ts_config.ts_case_fail_cb(tu_case_buf, tu_case_buf_len, - ts_config.ts_case_fail_arg); + ts_config.ts_case_fail_cb(tu_case_buf, ts_config.ts_case_fail_arg); } } @@ -232,8 +230,7 @@ tu_case_write_pass_buf(void) tu_case_reported = 1; if (ts_config.ts_case_pass_cb != NULL) { - ts_config.ts_case_pass_cb(tu_case_buf, tu_case_buf_len, - ts_config.ts_case_pass_arg); + ts_config.ts_case_pass_cb(tu_case_buf, ts_config.ts_case_pass_arg); } }