X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=test%2Ftest%2Ftest.h;h=7c24432303bd0f59a6bfea3bf969afee6ef71104;hb=aed545af1b5ed6b7baa2eb41bad63486d6c95226;hp=21ee25116b1e418deaa6a2beae0d74c3bc52cbef;hpb=e2887d5f5796d648af79a77cda62bff7e8bf4249;p=dpdk.git

diff --git a/test/test/test.h b/test/test/test.h
index 21ee25116b..7c24432303 100644
--- a/test/test/test.h
+++ b/test/test/test.h
@@ -8,11 +8,12 @@
 #include <stddef.h>
 #include <sys/queue.h>
 
+#include <rte_hexdump.h>
 #include <rte_common.h>
-#include <rte_log.h>
 
-#define TEST_SUCCESS  (0)
-#define TEST_FAILED  (-1)
+#define TEST_SUCCESS EXIT_SUCCESS
+#define TEST_FAILED  -1
+#define TEST_SKIPPED  77
 
 /* Before including test.h file you can define
  * TEST_TRACE_FAILURE(_file, _line, _func) macro to better trace/debug test
@@ -21,23 +22,13 @@
 # define TEST_TRACE_FAILURE(_file, _line, _func)
 #endif
 
-#define TEST_ASSERT(cond, msg, ...) do {                         \
-		if (!(cond)) {                                           \
-			printf("TestCase %s() line %d failed: "              \
-				msg "\n", __func__, __LINE__, ##__VA_ARGS__);    \
-			TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);    \
-			return TEST_FAILED;                                  \
-		}                                                        \
-} while (0)
+#define RTE_TEST_TRACE_FAILURE TEST_TRACE_FAILURE
 
-#define TEST_ASSERT_EQUAL(a, b, msg, ...) do {                   \
-		if (!(a == b)) {                                         \
-			printf("TestCase %s() line %d failed: "              \
-				msg "\n", __func__, __LINE__, ##__VA_ARGS__);    \
-			TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);    \
-			return TEST_FAILED;                                  \
-		}                                                        \
-} while (0)
+#include <rte_test.h>
+
+#define TEST_ASSERT RTE_TEST_ASSERT
+
+#define TEST_ASSERT_EQUAL RTE_TEST_ASSERT_EQUAL
 
 /* Compare two buffers (length in bytes) */
 #define TEST_ASSERT_BUFFERS_ARE_EQUAL(a, b, len,  msg, ...) do {	\
@@ -105,52 +96,15 @@
 	}                                                                     \
 } 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__);    \
-			TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);    \
-			return TEST_FAILED;                                  \
-		}                                                        \
-} while (0)
+#define TEST_ASSERT_NOT_EQUAL RTE_TEST_ASSERT_NOT_EQUAL
 
-#define TEST_ASSERT_SUCCESS(val, msg, ...) do {                  \
-		typeof(val) _val = (val);                                \
-		if (!(_val == 0)) {                                      \
-			printf("TestCase %s() line %d failed (err %d): "     \
-				msg "\n", __func__, __LINE__, _val,              \
-				##__VA_ARGS__);                                  \
-			TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);    \
-			return TEST_FAILED;                                  \
-		}                                                        \
-} while (0)
+#define TEST_ASSERT_SUCCESS RTE_TEST_ASSERT_SUCCESS
 
-#define TEST_ASSERT_FAIL(val, msg, ...) do {                     \
-		if (!(val != 0)) {                                       \
-			printf("TestCase %s() line %d failed: "              \
-				msg "\n", __func__, __LINE__, ##__VA_ARGS__);    \
-			TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);    \
-			return TEST_FAILED;                                  \
-		}                                                        \
-} while (0)
+#define TEST_ASSERT_FAIL RTE_TEST_ASSERT_FAIL
 
-#define TEST_ASSERT_NULL(val, msg, ...) do {                     \
-		if (!(val == NULL)) {                                    \
-			printf("TestCase %s() line %d failed: "              \
-				msg "\n", __func__, __LINE__, ##__VA_ARGS__);    \
-			TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);    \
-			return TEST_FAILED;                                  \
-		}                                                        \
-} while (0)
+#define TEST_ASSERT_NULL RTE_TEST_ASSERT_NULL
 
-#define TEST_ASSERT_NOT_NULL(val, msg, ...) do {                 \
-		if (!(val != NULL)) {                                    \
-			printf("TestCase %s() line %d failed: "              \
-				msg "\n", __func__, __LINE__, ##__VA_ARGS__);    \
-			TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);    \
-			return TEST_FAILED;                                  \
-		}                                                        \
-} while (0)
+#define TEST_ASSERT_NOT_NULL RTE_TEST_ASSERT_NOT_NULL
 
 struct unit_test_case {
 	int (*setup)(void);
@@ -175,11 +129,12 @@ struct unit_test_case {
 
 #define TEST_CASES_END() { NULL, NULL, NULL, NULL, 0 }
 
-#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG
-#define TEST_HEXDUMP(file, title, buf, len) rte_hexdump(file, title, buf, len)
-#else
-#define TEST_HEXDUMP(file, title, buf, len) do {} while (0)
-#endif
+static inline void
+debug_hexdump(FILE *file, const char *title, const void *buf, size_t len)
+{
+	if (rte_log_get_global_level() == RTE_LOG_DEBUG)
+		rte_hexdump(file, title, buf, len);
+}
 
 struct unit_test_suite {
 	const char *suite_name;
@@ -189,6 +144,7 @@ struct unit_test_suite {
 };
 
 int unit_test_suite_runner(struct unit_test_suite *suite);
+extern int last_test_result;
 
 #define RECURSIVE_ENV_VAR "RTE_TEST_RECURSIVE"