From b544ac3ab446a31b4401c591e6a32097b3b2a303 Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pekka.paalanen@collabora.com>
Date: Mon, 18 Nov 2019 16:47:45 +0200
Subject: [PATCH] tests: drop FAIL_TEST

Nothing is using FAIL_TEST or FAIL_TEST_P and that is good. Remove them to not
encourage using them.

If we need a test that should fail, it always needs to fail in a very specific
way which needs to be checked. For this we have e.g. expect_protocol_error().
We never want a fail-test to pass because it failed in a way we did not expect.
Therefore these macros are useless.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
---
 tests/weston-test-runner.c |  3 ---
 tests/weston-test-runner.h | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/tests/weston-test-runner.c b/tests/weston-test-runner.c
index 5e1585af..1fa1276e 100644
--- a/tests/weston-test-runner.c
+++ b/tests/weston-test-runner.c
@@ -140,9 +140,6 @@ exec_and_report_test(const struct weston_test_entry *t,
 		break;
 	}
 
-	if (t->must_fail)
-		success = !success;
-
 	if (success && !hardfail) {
 		fprintf(stderr, ", pass.\n");
 		return 1;
diff --git a/tests/weston-test-runner.h b/tests/weston-test-runner.h
index 6923ad8d..df9a0b80 100644
--- a/tests/weston-test-runner.h
+++ b/tests/weston-test-runner.h
@@ -44,23 +44,22 @@ struct weston_test_entry {
 	const void *table_data;
 	size_t element_size;
 	int n_elements;
-	int must_fail;
 } __attribute__ ((aligned (32)));
 
 #define TEST_BEGIN(name, arg)						\
 	static void name(arg)
 
-#define TEST_COMMON(func, name, ret, data, size, n_elem)		\
+#define TEST_COMMON(func, name, data, size, n_elem)			\
 	static void func(void *);					\
 									\
 	const struct weston_test_entry test##name			\
 		__attribute__ ((used, section ("test_section"))) =	\
 	{								\
-		#name, func, data, size, n_elem, ret			\
+		#name, func, data, size, n_elem				\
 	};
 
-#define NO_ARG_TEST(name, ret)						\
-	TEST_COMMON(wrap##name, name, ret, NULL, 0, 1)			\
+#define NO_ARG_TEST(name)						\
+	TEST_COMMON(wrap##name, name, NULL, 0, 1)			\
 	static void name(void);						\
 	static void wrap##name(void *data)				\
 	{								\
@@ -70,16 +69,14 @@ struct weston_test_entry {
 									\
 	TEST_BEGIN(name, void)
 
-#define ARG_TEST(name, ret, test_data)					\
-	TEST_COMMON(name, name, ret, test_data,				\
+#define ARG_TEST(name, test_data)					\
+	TEST_COMMON(name, name, test_data,				\
 		    sizeof(test_data[0]),				\
 		    ARRAY_LENGTH(test_data))				\
 	TEST_BEGIN(name, void *data)					\
 
-#define TEST(name) NO_ARG_TEST(name, 0)
-#define FAIL_TEST(name) NO_ARG_TEST(name, 1)
-#define TEST_P(name, data) ARG_TEST(name, 0, data)
-#define FAIL_TEST_P(name, data) ARG_TEST(name, 1, data)
+#define TEST(name) NO_ARG_TEST(name)
+#define TEST_P(name, data) ARG_TEST(name, data)
 
 void
 testlog(const char *fmt, ...) WL_PRINTF(1, 2);