git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/txgbe: add PHY init
[dpdk.git]
/
app
/
test
/
test.c
diff --git
a/app/test/test.c
b/app/test/test.c
index
1c91ed6
..
f27a56e
100644
(file)
--- a/
app/test/test.c
+++ b/
app/test/test.c
@@
-12,7
+12,7
@@
#include <ctype.h>
#include <sys/queue.h>
#include <ctype.h>
#include <sys/queue.h>
-#ifdef RTE_LIB
RTE
_CMDLINE
+#ifdef RTE_LIB_CMDLINE
#include <cmdline_rdline.h>
#include <cmdline_parse.h>
#include <cmdline_socket.h>
#include <cmdline_rdline.h>
#include <cmdline_parse.h>
#include <cmdline_socket.h>
@@
-25,12
+25,12
@@
extern cmdline_parse_ctx_t main_ctx[];
#include <rte_cycles.h>
#include <rte_log.h>
#include <rte_string_fns.h>
#include <rte_cycles.h>
#include <rte_log.h>
#include <rte_string_fns.h>
-#ifdef RTE_LIB
RTE
_TIMER
+#ifdef RTE_LIB_TIMER
#include <rte_timer.h>
#endif
#include "test.h"
#include <rte_timer.h>
#endif
#include "test.h"
-#ifdef RTE_LIB
RTE
_PDUMP
+#ifdef RTE_LIB_PDUMP
#include "test_pdump.h"
#endif
#include "test_pdump.h"
#endif
@@
-52,11
+52,13
@@
do_recursive_call(void)
int (*action_fn)(void);
} actions[] = {
{ "run_secondary_instances", test_mp_secondary },
int (*action_fn)(void);
} actions[] = {
{ "run_secondary_instances", test_mp_secondary },
-#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIB_PDUMP
+#ifdef RTE_NET_RING
{ "run_pdump_server_tests", test_pdump },
{ "run_pdump_server_tests", test_pdump },
+#endif
#endif
{ "test_missing_c_flag", no_action },
#endif
{ "test_missing_c_flag", no_action },
- { "test_ma
ster
_lcore_flag", no_action },
+ { "test_ma
in
_lcore_flag", no_action },
{ "test_invalid_n_flag", no_action },
{ "test_no_hpet_flag", no_action },
{ "test_whitelist_flag", no_action },
{ "test_invalid_n_flag", no_action },
{ "test_no_hpet_flag", no_action },
{ "test_whitelist_flag", no_action },
@@
-67,11
+69,14
@@
do_recursive_call(void)
{ "test_memory_flags", no_action },
{ "test_file_prefix", no_action },
{ "test_no_huge_flag", no_action },
{ "test_memory_flags", no_action },
{ "test_file_prefix", no_action },
{ "test_no_huge_flag", no_action },
+#ifdef RTE_LIB_TIMER
+ { "timer_secondary_spawn_wait", test_timer_secondary },
+#endif
};
if (recursive_call == NULL)
return -1;
};
if (recursive_call == NULL)
return -1;
- for (i = 0; i <
sizeof(actions)/sizeof(actions[0]
); i++) {
+ for (i = 0; i <
RTE_DIM(actions
); i++) {
if (strcmp(actions[i].env_var, recursive_call) == 0)
return (actions[i].action_fn)();
}
if (strcmp(actions[i].env_var, recursive_call) == 0)
return (actions[i].action_fn)();
}
@@
-86,7
+91,7
@@
int last_test_result;
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
-#ifdef RTE_LIB
RTE
_CMDLINE
+#ifdef RTE_LIB_CMDLINE
struct cmdline *cl;
#endif
char *extra_args;
struct cmdline *cl;
#endif
char *extra_args;
@@
-129,8
+134,11
@@
main(int argc, char **argv)
goto out;
}
goto out;
}
-#ifdef RTE_LIBRTE_TIMER
- rte_timer_subsystem_init();
+#ifdef RTE_LIB_TIMER
+ if (rte_timer_subsystem_init() < 0) {
+ ret = -1;
+ goto out;
+ }
#endif
if (commands_init() < 0) {
#endif
if (commands_init() < 0) {
@@
-155,7
+163,7
@@
main(int argc, char **argv)
"HPET is not enabled, using TSC as default timer\n");
"HPET is not enabled, using TSC as default timer\n");
-#ifdef RTE_LIB
RTE
_CMDLINE
+#ifdef RTE_LIB_CMDLINE
cl = cmdline_stdin_new(main_ctx, "RTE>>");
if (cl == NULL) {
ret = -1;
cl = cmdline_stdin_new(main_ctx, "RTE>>");
if (cl == NULL) {
ret = -1;
@@
-183,6
+191,9
@@
main(int argc, char **argv)
ret = 0;
out:
ret = 0;
out:
+#ifdef RTE_LIB_TIMER
+ rte_timer_subsystem_finalize();
+#endif
rte_eal_cleanup();
return ret;
}
rte_eal_cleanup();
return ret;
}
@@
-201,14
+212,16
@@
unit_test_suite_runner(struct unit_test_suite *suite)
printf(" + Test Suite : %s\n", suite->suite_name);
}
printf(" + Test Suite : %s\n", suite->suite_name);
}
- if (suite->setup)
- if (suite->setup() != 0) {
+ if (suite->setup) {
+ test_success = suite->setup();
+ if (test_success != 0) {
/*
/*
- * setup
failed, so count all enabled tests and mark
- *
them as fail
ed
+ * setup
did not pass, so count all enabled tests and
+ *
mark them as failed/skipp
ed
*/
while (suite->unit_test_cases[total].testcase) {
*/
while (suite->unit_test_cases[total].testcase) {
- if (!suite->unit_test_cases[total].enabled)
+ if (!suite->unit_test_cases[total].enabled ||
+ test_success == TEST_SKIPPED)
skipped++;
else
failed++;
skipped++;
else
failed++;
@@
-216,6
+229,7
@@
unit_test_suite_runner(struct unit_test_suite *suite)
}
goto suite_summary;
}
}
goto suite_summary;
}
+ }
printf(" + ------------------------------------------------------- +\n");
printf(" + ------------------------------------------------------- +\n");
@@
-239,6
+253,8
@@
unit_test_suite_runner(struct unit_test_suite *suite)
test_success = suite->unit_test_cases[total].testcase();
if (test_success == TEST_SUCCESS)
succeeded++;
test_success = suite->unit_test_cases[total].testcase();
if (test_success == TEST_SUCCESS)
succeeded++;
+ else if (test_success == TEST_SKIPPED)
+ skipped++;
else if (test_success == -ENOTSUP)
unsupported++;
else
else if (test_success == -ENOTSUP)
unsupported++;
else
@@
-255,6
+271,8
@@
unit_test_suite_runner(struct unit_test_suite *suite)
if (test_success == TEST_SUCCESS)
status = "succeeded";
if (test_success == TEST_SUCCESS)
status = "succeeded";
+ else if (test_success == TEST_SKIPPED)
+ status = "skipped";
else if (test_success == -ENOTSUP)
status = "unsupported";
else
else if (test_success == -ENOTSUP)
status = "unsupported";
else
@@
-286,7
+304,8
@@
suite_summary:
last_test_result = failed;
if (failed)
last_test_result = failed;
if (failed)
- return -1;
-
- return 0;
+ return TEST_FAILED;
+ if (total == skipped)
+ return TEST_SKIPPED;
+ return TEST_SUCCESS;
}
}