tile: fix build

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

diff --git a/app/test/test.c b/app/test/test.c
index 589a168..cd0e784 100644 (file)
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -51,7 +51,6 @@ extern cmdline_parse_ctx_t main_ctx[];
 
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_cycles.h>
 #include <rte_log.h>
@@ -66,7 +65,6 @@ extern cmdline_parse_ctx_t main_ctx[];
 
 const char *prgname; /* to be set to argv[0] */
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
 static const char *recursive_call; /* used in linuxapp for MP and other tests */
 
 static int
@@ -82,7 +80,8 @@ do_recursive_call(void)
        } actions[] =  {
                        { "run_secondary_instances", test_mp_secondary },
                        { "test_missing_c_flag", no_action },
-                       { "test_missing_n_flag", no_action },
+                       { "test_master_lcore_flag", no_action },
+                       { "test_invalid_n_flag", no_action },
                        { "test_no_hpet_flag", no_action },
                        { "test_whitelist_flag", no_action },
                        { "test_invalid_b_flag", no_action },
@@ -96,7 +95,6 @@ do_recursive_call(void)
                        { "test_memory_flags", no_action },
                        { "test_file_prefix", no_action },
                        { "test_no_huge_flag", no_action },
-                       { "test_ivshmem", test_ivshmem },
        };
 
        if (recursive_call == NULL)
@@ -108,7 +106,6 @@ do_recursive_call(void)
        printf("ERROR - missing action to take for %s\n", recursive_call);
        return -1;
 }
-#endif
 
 int
 main(int argc, char **argv)
@@ -126,14 +123,15 @@ main(int argc, char **argv)
        rte_timer_subsystem_init();
 #endif
 
+       if (commands_init() < 0)
+               return -1;
+
        argv += ret;
 
        prgname = argv[0];
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
        if ((recursive_call = getenv(RECURSIVE_ENV_VAR)) != NULL)
                return do_recursive_call();
-#endif
 
 #ifdef RTE_LIBEAL_USE_HPET
        if (rte_eal_hpet_init(1) < 0)
@@ -158,51 +156,82 @@ main(int argc, char **argv)
 int
 unit_test_suite_runner(struct unit_test_suite *suite)
 {
-       int retval, i = 0;
+       int test_success;
+       unsigned total = 0, executed = 0, skipped = 0, succeeded = 0, failed = 0;
 
-       if (suite->suite_name)
-               printf("Test Suite : %s\n", suite->suite_name);
+       if (suite->suite_name) {
+               printf(" + ------------------------------------------------------- +\n");
+               printf(" + Test Suite : %s\n", suite->suite_name);
+       }
 
        if (suite->setup)
                if (suite->setup() != 0)
-                       return -1;
-
-       while (suite->unit_test_cases[i].testcase) {
-               /* Run test case setup */
-               if (suite->unit_test_cases[i].setup) {
-                       retval = suite->unit_test_cases[i].setup();
-                       if (retval != 0)
-                               return retval;
-               }
+                       goto suite_summary;
 
-               /* Run test case */
-               if (suite->unit_test_cases[i].testcase() == 0) {
-                       printf("TestCase %2d: %s\n", i,
-                                       suite->unit_test_cases[i].success_msg ?
-                                       suite->unit_test_cases[i].success_msg :
-                                       "passed");
-               }
-               else {
-                       printf("TestCase %2d: %s\n", i, suite->unit_test_cases[i].fail_msg ?
-                                       suite->unit_test_cases[i].fail_msg :
-                                       "failed");
-                       return -1;
+       printf(" + ------------------------------------------------------- +\n");
+
+       while (suite->unit_test_cases[total].testcase) {
+               if (!suite->unit_test_cases[total].enabled) {
+                       skipped++;
+                       total++;
+                       continue;
+               } else {
+                       executed++;
                }
 
-               /* Run test case teardown */
-               if (suite->unit_test_cases[i].teardown) {
-                       retval = suite->unit_test_cases[i].teardown();
-                       if (retval != 0)
-                               return retval;
+               /* run test case setup */
+               if (suite->unit_test_cases[total].setup)
+                       test_success = suite->unit_test_cases[total].setup();
+               else
+                       test_success = TEST_SUCCESS;
+
+               if (test_success == TEST_SUCCESS) {
+                       /* run the test case */
+                       test_success = suite->unit_test_cases[total].testcase();
+                       if (test_success == TEST_SUCCESS)
+                               succeeded++;
+                       else
+                               failed++;
+               } else {
+                       failed++;
                }
 
-               i++;
+               /* run the test case teardown */
+               if (suite->unit_test_cases[total].teardown)
+                       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");
+               else
+                       printf(" + TestCase [%2d] : %s\n", total,
+                                       suite->unit_test_cases[total].fail_msg ?
+                                       suite->unit_test_cases[total].fail_msg :
+                                       "failed");
+
+               total++;
        }
 
        /* Run test suite teardown */
        if (suite->teardown)
-               if (suite->teardown() != 0)
-                       return -1;
+               suite->teardown();
+
+       goto suite_summary;
+
+suite_summary:
+       printf(" + ------------------------------------------------------- +\n");
+       printf(" + Test Suite Summary \n");
+       printf(" + Tests Total :       %2d\n", total);
+       printf(" + Tests Skipped :     %2d\n", skipped);
+       printf(" + Tests Executed :    %2d\n", executed);
+       printf(" + Tests Passed :      %2d\n", succeeded);
+       printf(" + Tests Failed :      %2d\n", failed);
+       printf(" + ------------------------------------------------------- +\n");
+
+       if (failed)
+               return -1;
 
        return 0;
 }