app: no more bare metal environment

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

diff --git a/app/test/test.h b/app/test/test.h
index 181c38e..72e67b9 100644 (file)
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -34,6 +34,8 @@
 #ifndef _TEST_H_
 #define _TEST_H_
 
+#include <sys/queue.h>
+
 #define TEST_ASSERT(cond, msg, ...) do {                                               \
                if (!(cond)) {                                                                                  \
                        printf("TestCase %s() line %d failed: "                 \
@@ -60,14 +62,15 @@
 
 #define TEST_ASSERT_SUCCESS(val, msg, ...) do {                                        \
                if (!(val == 0)) {                                                                              \
-                       printf("TestCase %s() line %d failed: "                 \
-                               msg "\n", __func__, __LINE__, ##__VA_ARGS__);   \
+                       printf("TestCase %s() line %d failed (err %d): "        \
+                               msg "\n", __func__, __LINE__, val,                              \
+                               ##__VA_ARGS__);                                                                 \
                        return -1;                                                                                      \
                }                                                                                                               \
 } while (0)
 
 #define TEST_ASSERT_FAIL(val, msg, ...) do {                                   \
-               if (!(val != -1)) {                                                                             \
+               if (!(val != 0)) {                                                                              \
                        printf("TestCase %s() line %d failed: "                 \
                                msg "\n", __func__, __LINE__, ##__VA_ARGS__);   \
                        return -1;                                                                                      \
@@ -116,71 +119,40 @@ struct unit_test_suite {
 
 int unit_test_suite_runner(struct unit_test_suite *suite);
 
-/* icc on baremetal gives us troubles with function named 'main' */
-#ifdef RTE_EXEC_ENV_BAREMETAL
-#define main _main
-#endif
-
 #define RECURSIVE_ENV_VAR "RTE_TEST_RECURSIVE"
 
+#include <cmdline_parse.h>
+#include <cmdline_parse_string.h>
+
 extern const char *prgname;
 
-int main(int argc, char **argv);
+int commands_init(void);
 
 int test_pci(void);
-int test_memory(void);
-int test_per_lcore(void);
-int test_spinlock(void);
-int test_rwlock(void);
-int test_atomic(void);
-int test_byteorder(void);
-int test_prefetch(void);
-int test_cycles(void);
-int test_logs(void);
-int test_memzone(void);
-int test_ring(void);
-int test_table(void);
-int test_ring_perf(void);
-int test_mempool(void);
-int test_mempool_perf(void);
-int test_mbuf(void);
-int test_timer(void);
-int test_timer_perf(void);
-int test_malloc(void);
-int test_memcpy(void);
-int test_memcpy_perf(void);
-int test_hash(void);
-int test_hash_perf(void);
-int test_lpm(void);
-int test_lpm6(void);
-int test_debug(void);
-int test_errno(void);
-int test_tailq(void);
-int test_string_fns(void);
+int test_pci_run;
+
 int test_mp_secondary(void);
-int test_cpuflags(void);
-int test_eal_flags(void);
-int test_alarm(void);
-int test_interrupt(void);
-int test_version(void);
-int test_eal_fs(void);
-int test_cmdline(void);
-int test_func_reentrancy(void);
-int test_red(void);
-int test_sched(void);
-int test_meter(void);
-int test_acl(void);
-int test_kni(void);
-int test_power(void);
-int test_common(void);
-int test_pmd_ring(void);
+
 int test_ivshmem(void);
-int test_distributor(void);
-int test_distributor_perf(void);
-int test_kvargs(void);
-int test_devargs(void);
-int test_link_bonding(void);
+int test_set_rxtx_conf(cmdline_fixed_string_t mode);
+int test_set_rxtx_anchor(cmdline_fixed_string_t type);
+int test_set_rxtx_sc(cmdline_fixed_string_t type);
+
+typedef int (test_callback)(void);
+TAILQ_HEAD(test_commands_list, test_command);
+struct test_command {
+       TAILQ_ENTRY(test_command) next;
+       const char *command;
+       test_callback *callback;
+};
 
-int test_pci_run;
+void add_test_command(struct test_command *t);
+
+#define REGISTER_TEST_COMMAND(t) \
+static void testfn_##t(void);\
+void __attribute__((constructor, used)) testfn_##t(void)\
+{\
+       add_test_command(&t);\
+}
 
 #endif