test: store only the test case name

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 <jerin.jacob@caviumnetworks.com>
Tested-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>

diff --git a/test/test/test.c b/test/test/test.c
index cd0e7845892d51c917126566b621538b484d42dc..a86dc86e841268116f2d667312557b5436256ecc 100644 (file)
--- 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 82831f4e6cf4ae650aca49c7e191e39208f83b18..9a979d36e900ee9fc00db0103cc9ef9b9e681e44 100644 (file)
--- 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)