X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest.c;h=cd0e7845892d51c917126566b621538b484d42dc;hb=dd0eedb1cfcf0cb7423d859177c5bc6f931eaf8a;hp=f586aeaa7c2b5afab72c0e1173c23174b8830287;hpb=fa34246adddb8d99755c65155b420bc54896117d;p=dpdk.git diff --git a/app/test/test.c b/app/test/test.c index f586aeaa7c..cd0e784589 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -41,19 +41,23 @@ #include #include +#ifdef RTE_LIBRTE_CMDLINE #include #include #include #include +extern cmdline_parse_ctx_t main_ctx[]; +#endif #include #include -#include #include -#include #include #include #include +#ifdef RTE_LIBRTE_TIMER +#include +#endif #include "test.h" @@ -61,7 +65,6 @@ 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 @@ -77,12 +80,18 @@ 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 }, + { "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 }, @@ -94,30 +103,35 @@ do_recursive_call(void) if (strcmp(actions[i].env_var, recursive_call) == 0) return (actions[i].action_fn)(); } + printf("ERROR - missing action to take for %s\n", recursive_call); return -1; } -#endif int main(int argc, char **argv) { +#ifdef RTE_LIBRTE_CMDLINE struct cmdline *cl; +#endif int ret; ret = rte_eal_init(argc, argv); if (ret < 0) return -1; +#ifdef RTE_LIBRTE_TIMER 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) @@ -126,13 +140,98 @@ main(int argc, char **argv) "HPET is not enabled, using TSC as default timer\n"); - +#ifdef RTE_LIBRTE_CMDLINE cl = cmdline_stdin_new(main_ctx, "RTE>>"); if (cl == NULL) { return -1; } cmdline_interact(cl); cmdline_stdin_exit(cl); +#endif + + return 0; +} + + +int +unit_test_suite_runner(struct unit_test_suite *suite) +{ + int test_success; + unsigned total = 0, executed = 0, skipped = 0, succeeded = 0, failed = 0; + + if (suite->suite_name) { + printf(" + ------------------------------------------------------- +\n"); + printf(" + Test Suite : %s\n", suite->suite_name); + } + + if (suite->setup) + if (suite->setup() != 0) + goto suite_summary; + + printf(" + ------------------------------------------------------- +\n"); + + while (suite->unit_test_cases[total].testcase) { + if (!suite->unit_test_cases[total].enabled) { + skipped++; + total++; + continue; + } else { + executed++; + } + + /* 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++; + } + + /* 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) + 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; }