Add hftest macros to fail with a message.
Fail if secondary gets unexpected message.
Change-Id: I410e48b67e0dbe33daaf744c7408a99a031a78ac
diff --git a/test/hftest/inc/hftest.h b/test/hftest/inc/hftest.h
index 894d7f0..a1179fa 100644
--- a/test/hftest/inc/hftest.h
+++ b/test/hftest/inc/hftest.h
@@ -50,8 +50,8 @@
#define ASSERT_GE(x, y) HFTEST_ASSERT_OP(x, y, >=, true)
#define ASSERT_GT(x, y) HFTEST_ASSERT_OP(x, y, >, true)
-#define ASSERT_TRUE(x) ASSERT_EQ(x, true);
-#define ASSERT_FALSE(x) ASSERT_EQ(x, false);
+#define ASSERT_TRUE(x) ASSERT_EQ(x, true)
+#define ASSERT_FALSE(x) ASSERT_EQ(x, false)
#define EXPECT_EQ(x, y) HFTEST_ASSERT_OP(x, y, ==, false)
#define EXPECT_NE(x, y) HFTEST_ASSERT_OP(x, y, !=, false)
@@ -60,8 +60,11 @@
#define EXPECT_GE(x, y) HFTEST_ASSERT_OP(x, y, >=, false)
#define EXPECT_GT(x, y) HFTEST_ASSERT_OP(x, y, >, false)
-#define EXPECT_TRUE(x) EXPECT_EQ(x, true);
-#define EXPECT_FALSE(x) EXPECT_EQ(x, false);
+#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)
/* Service utilities. */
#define SERVICE_SELECT(vm_id, service, send_buffer) \