X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=blobdiff_plain;f=app%2Ftest%2Ftest.h;h=72e67b9c37b81e756c24a8146dee0c3273da381e;hp=c54e7ef3bf6e9f2905cd2c86aac63ac0acf036a0;hb=503f9e8b42562b923e73e908be6ba69964f1f1e7;hpb=5205954791cb96244904f2c904a75d29a9bbf31b

diff --git a/app/test/test.h b/app/test/test.h
index c54e7ef3bf..72e67b9c37 100644
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -34,70 +34,125 @@
 #ifndef _TEST_H_
 #define _TEST_H_
 
-/* icc on baremetal gives us troubles with function named 'main' */
-#ifdef RTE_EXEC_ENV_BAREMETAL
-#define main _main
-#endif
+#include <sys/queue.h>
+
+#define TEST_ASSERT(cond, msg, ...) do {						\
+		if (!(cond)) {											\
+			printf("TestCase %s() line %d failed: "			\
+				msg "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+			return -1;											\
+		}														\
+} while (0)
+
+#define TEST_ASSERT_EQUAL(a, b, msg, ...)  {					\
+		if (!(a == b)) {										\
+			printf("TestCase %s() line %d failed: "				\
+				msg "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+			return -1;											\
+		}														\
+} while (0)
+
+#define TEST_ASSERT_NOT_EQUAL(a, b, msg, ...) do {				\
+		if (!(a != b)) {										\
+			printf("TestCase %s() line %d failed: "			\
+				msg "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+			return -1;											\
+		}														\
+} while (0)
+
+#define TEST_ASSERT_SUCCESS(val, msg, ...) do {					\
+		if (!(val == 0)) {										\
+			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 != 0)) {										\
+			printf("TestCase %s() line %d failed: "			\
+				msg "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+			return -1;											\
+		}														\
+} while (0)
+
+
+#define TEST_ASSERT_NULL(val, msg, ...) do {					\
+		if (!(val == NULL)) {									\
+			printf("TestCase %s() line %d failed: "			\
+				msg "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+			return -1;											\
+		}														\
+} while (0)
+
+#define TEST_ASSERT_NOT_NULL(val, msg, ...) do {				\
+		if (!(val != NULL)) {									\
+			printf("TestCase %s() line %d failed: "			\
+				msg "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+			return -1;											\
+		}														\
+} while (0)
+
+struct unit_test_case {
+	int (*setup)(void);
+	int (*teardown)(void);
+	int (*testcase)(void);
+	const char *success_msg;
+	const char *fail_msg;
+};
+
+#define TEST_CASE(fn) { NULL, NULL, fn, #fn " succeeded", #fn " failed"}
+
+#define TEST_CASE_ST(setup, teardown, testcase) 		\
+		{ setup, teardown, testcase, #testcase " succeeded",	\
+		#testcase " failed "}
+
+#define TEST_CASES_END() { NULL, NULL, NULL, NULL, NULL }
+
+struct unit_test_suite {
+	const char *suite_name;
+	int (*setup)(void);
+	int (*teardown)(void);
+	struct unit_test_case unit_test_cases[];
+};
+
+int unit_test_suite_runner(struct unit_test_suite *suite);
 
 #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_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);
 
-int test_pci_run;
+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;
+};
+
+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