net/virtio: fix incorrect cast of void *

[dpdk.git] / test / test / test.c

diff --git a/test/test/test.c b/test/test/test.c
index cd0e784..0e6ff7c 100644 (file)
--- a/test/test/test.c
+++ b/test/test/test.c
@@ -50,7 +50,6 @@ extern cmdline_parse_ctx_t main_ctx[];
 #endif
 
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_eal.h>
 #include <rte_cycles.h>
 #include <rte_log.h>
@@ -87,11 +86,7 @@ do_recursive_call(void)
                        { "test_invalid_b_flag", no_action },
                        { "test_invalid_vdev_flag", no_action },
                        { "test_invalid_r_flag", no_action },
-#ifdef RTE_LIBRTE_XEN_DOM0
-                       { "test_dom0_misc_flags", no_action },
-#else
                        { "test_misc_flags", no_action },
-#endif
                        { "test_memory_flags", no_action },
                        { "test_file_prefix", no_action },
                        { "test_no_huge_flag", no_action },
@@ -157,7 +152,9 @@ int
 unit_test_suite_runner(struct unit_test_suite *suite)
 {
        int test_success;
-       unsigned total = 0, executed = 0, skipped = 0, succeeded = 0, failed = 0;
+       unsigned int total = 0, executed = 0, skipped = 0;
+       unsigned int succeeded = 0, failed = 0, unsupported = 0;
+       const char *status;
 
        if (suite->suite_name) {
                printf(" + ------------------------------------------------------- +\n");
@@ -190,8 +187,12 @@ unit_test_suite_runner(struct unit_test_suite *suite)
                        test_success = suite->unit_test_cases[total].testcase();
                        if (test_success == TEST_SUCCESS)
                                succeeded++;
+                       else if (test_success == -ENOTSUP)
+                               unsupported++;
                        else
                                failed++;
+               } else if (test_success == -ENOTSUP) {
+                       unsupported++;
                } else {
                        failed++;
                }
@@ -201,15 +202,14 @@ 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 if (test_success == -ENOTSUP)
+                       status = "unsupported";
                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++;
        }
@@ -226,6 +226,7 @@ suite_summary:
        printf(" + Tests Total :       %2d\n", total);
        printf(" + Tests Skipped :     %2d\n", skipped);
        printf(" + Tests Executed :    %2d\n", executed);
+       printf(" + Tests Unsupported:  %2d\n", unsupported);
        printf(" + Tests Passed :      %2d\n", succeeded);
        printf(" + Tests Failed :      %2d\n", failed);
        printf(" + ------------------------------------------------------- +\n");