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
remove trailing whitespaces
[dpdk.git]
/
app
/
test
/
test.c
diff --git
a/app/test/test.c
b/app/test/test.c
index
5fa1fa1
..
516829d
100644
(file)
--- a/
app/test/test.c
+++ b/
app/test/test.c
@@
-1,13
+1,13
@@
/*-
* BSD LICENSE
/*-
* BSD LICENSE
- *
- * Copyright(c) 2010-201
3
Intel Corporation. All rights reserved.
+ *
+ * Copyright(c) 2010-201
4
Intel Corporation. All rights reserved.
* 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:
* 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
* * 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.
* * 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
* 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,24
@@
#include <ctype.h>
#include <sys/queue.h>
#include <ctype.h>
#include <sys/queue.h>
+#ifdef RTE_LIBRTE_CMDLINE
#include <cmdline_rdline.h>
#include <cmdline_parse.h>
#include <cmdline_socket.h>
#include <cmdline.h>
#include <cmdline_rdline.h>
#include <cmdline_parse.h>
#include <cmdline_socket.h>
#include <cmdline.h>
+extern cmdline_parse_ctx_t main_ctx[];
+#endif
#include <rte_memory.h>
#include <rte_memzone.h>
#include <rte_tailq.h>
#include <rte_eal.h>
#include <rte_memory.h>
#include <rte_memzone.h>
#include <rte_tailq.h>
#include <rte_eal.h>
-#include <rte_timer.h>
#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_LIBRTE_TIMER
+#include <rte_timer.h>
+#endif
#include "test.h"
#include "test.h"
@@
-79,12
+84,18
@@
do_recursive_call(void)
{ "test_missing_c_flag", no_action },
{ "test_missing_n_flag", no_action },
{ "test_no_hpet_flag", no_action },
{ "test_missing_c_flag", no_action },
{ "test_missing_n_flag", no_action },
{ "test_no_hpet_flag", no_action },
+ { "test_whitelist_flag", no_action },
{ "test_invalid_b_flag", no_action },
{ "test_invalid_r_flag", no_action },
{ "test_invalid_b_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 },
{ "test_misc_flags", no_action },
+#endif
{ "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 },
+ { "test_ivshmem", test_ivshmem },
};
if (recursive_call == NULL)
};
if (recursive_call == NULL)
@@
-93,6
+104,7
@@
do_recursive_call(void)
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)();
}
+ printf("ERROR - missing action to take for %s\n", recursive_call);
return -1;
}
#endif
return -1;
}
#endif
@@
-100,14
+112,18
@@
do_recursive_call(void)
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
+#ifdef RTE_LIBRTE_CMDLINE
struct cmdline *cl;
struct cmdline *cl;
+#endif
int ret;
ret = rte_eal_init(argc, argv);
if (ret < 0)
return -1;
int ret;
ret = rte_eal_init(argc, argv);
if (ret < 0)
return -1;
+#ifdef RTE_LIBRTE_TIMER
rte_timer_subsystem_init();
rte_timer_subsystem_init();
+#endif
argv += ret;
argv += ret;
@@
-125,13
+141,14
@@
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_LIBRTE_CMDLINE
cl = cmdline_stdin_new(main_ctx, "RTE>>");
if (cl == NULL) {
return -1;
}
cmdline_interact(cl);
cmdline_stdin_exit(cl);
cl = cmdline_stdin_new(main_ctx, "RTE>>");
if (cl == NULL) {
return -1;
}
cmdline_interact(cl);
cmdline_stdin_exit(cl);
+#endif
return 0;
}
return 0;
}