From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerin Jacob Subject: [PATCH 1/2] test: store only the test case name Date: Sun, 19 Mar 2017 19:07:33 +0530 Message-ID: <1489930654-16827-2-git-send-email-jerin.jacob@caviumnetworks.com> References: <1489930654-16827-1-git-send-email-jerin.jacob@caviumnetworks.com> Mime-Version: 1.0 Content-Type: text/plain Cc: thomas.monjalon@6wind.com, harry.van.haaren@intel.com, Jerin Jacob To: dev@dpdk.org Return-path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0080.outbound.protection.outlook.com [104.47.37.80]) by dpdk.org (Postfix) with ESMTP id 2D39969A5 for ; Sun, 19 Mar 2017 14:38:11 +0100 (CET) In-Reply-To: <1489930654-16827-1-git-send-email-jerin.jacob@caviumnetworks.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Store only the test case name in unit test case structure.The actor who renders the test status can add appropriate test status. This enables adding the new test case status without storing the additional information in the unit test case structure. Signed-off-by: Jerin Jacob --- test/test/test.c | 14 ++++++-------- test/test/test.h | 23 +++++++++-------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/test/test/test.c b/test/test/test.c index cd0e784..a86dc86 100644 --- a/test/test/test.c +++ b/test/test/test.c @@ -158,6 +158,7 @@ unit_test_suite_runner(struct unit_test_suite *suite) { int test_success; unsigned total = 0, executed = 0, skipped = 0, succeeded = 0, failed = 0; + const char *status; if (suite->suite_name) { printf(" + ------------------------------------------------------- +\n"); @@ -201,15 +202,12 @@ unit_test_suite_runner(struct unit_test_suite *suite) suite->unit_test_cases[total].teardown(); if (test_success == TEST_SUCCESS) - printf(" + TestCase [%2d] : %s\n", total, - suite->unit_test_cases[total].success_msg ? - suite->unit_test_cases[total].success_msg : - "passed"); + status = "succeeded"; else - printf(" + TestCase [%2d] : %s\n", total, - suite->unit_test_cases[total].fail_msg ? - suite->unit_test_cases[total].fail_msg : - "failed"); + status = "failed"; + + printf(" + TestCase [%2d] : %s %s\n", total, + suite->unit_test_cases[total].name, status); total++; } diff --git a/test/test/test.h b/test/test/test.h index 82831f4..9a979d3 100644 --- a/test/test/test.h +++ b/test/test/test.h @@ -185,29 +185,24 @@ struct unit_test_case { int (*setup)(void); void (*teardown)(void); int (*testcase)(void); - const char *success_msg; - const char *fail_msg; + const char *name; unsigned enabled; }; -#define TEST_CASE(fn) { NULL, NULL, fn, #fn " succeeded", #fn " failed", 1 } +#define TEST_CASE(fn) { NULL, NULL, fn, #fn, 1 } -#define TEST_CASE_NAMED(name, fn) { NULL, NULL, fn, name " succeeded", \ - name " failed", 1 } +#define TEST_CASE_NAMED(name, fn) { NULL, NULL, fn, name, 1 } -#define TEST_CASE_ST(setup, teardown, testcase) \ - { setup, teardown, testcase, #testcase " succeeded", \ - #testcase " failed ", 1 } +#define TEST_CASE_ST(setup, teardown, testcase) \ + { setup, teardown, testcase, #testcase, 1 } -#define TEST_CASE_DISABLED(fn) { NULL, NULL, fn, #fn " succeeded", \ - #fn " failed", 0 } +#define TEST_CASE_DISABLED(fn) { NULL, NULL, fn, #fn, 0 } -#define TEST_CASE_ST_DISABLED(setup, teardown, testcase) \ - { setup, teardown, testcase, #testcase " succeeded", \ - #testcase " failed ", 0 } +#define TEST_CASE_ST_DISABLED(setup, teardown, testcase) \ + { setup, teardown, testcase, #testcase, 0 } -#define TEST_CASES_END() { NULL, NULL, NULL, NULL, NULL, 0 } +#define TEST_CASES_END() { NULL, NULL, NULL, NULL, 0 } #if RTE_LOG_LEVEL >= RTE_LOG_DEBUG #define TEST_HEXDUMP(file, title, buf, len) rte_hexdump(file, title, buf, len) -- 2.5.5