Allow arguments to FAIL macro in test.
Change-Id: Ia8f0b7e0d333452f5f7be1b499d7323a62cc037f
diff --git a/test/hftest/inc/hftest.h b/test/hftest/inc/hftest.h
index 6a1af34..703176c 100644
--- a/test/hftest/inc/hftest.h
+++ b/test/hftest/inc/hftest.h
@@ -63,8 +63,7 @@
#define EXPECT_TRUE(x) EXPECT_EQ(x, true)
#define EXPECT_FALSE(x) EXPECT_EQ(x, false)
-#define FAIL(message) HFTEST_FAIL(message, true)
-#define ADD_FAILURE(message) HFTEST_FAIL(message, false)
+#define FAIL(...) HFTEST_FAIL(true, __VA_ARGS__)
/* Service utilities. */
#define SERVICE_SELECT(vm_id, service, send_buffer) \
diff --git a/test/hftest/inc/hftest_impl.h b/test/hftest/inc/hftest_impl.h
index c4df298..093ecf0 100644
--- a/test/hftest/inc/hftest_impl.h
+++ b/test/hftest/inc/hftest_impl.h
@@ -253,15 +253,16 @@
} \
} while (0)
-#define HFTEST_FAIL(message, fatal) \
- do { \
- struct hftest_context *ctx = hftest_get_context(); \
- ++ctx->failures; \
- HFTEST_LOG_FAILURE(); \
- dlog(HFTEST_LOG_PREFIX HFTEST_LOG_INDENT "%s\n", message); \
- if (fatal) { \
- ctx->abort(); \
- } \
+#define HFTEST_FAIL(fatal, ...) \
+ do { \
+ struct hftest_context *ctx = hftest_get_context(); \
+ ++ctx->failures; \
+ HFTEST_LOG_FAILURE(); \
+ dlog(HFTEST_LOG_PREFIX HFTEST_LOG_INDENT __VA_ARGS__); \
+ dlog("\n"); \
+ if (fatal) { \
+ ctx->abort(); \
+ } \
} while (0)
/**