From dd13498862470a63199867bc69a8abc55b72ba56 Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pekka.paalanen@collabora.com>
Date: Wed, 13 Nov 2019 16:28:20 +0200
Subject: [PATCH] tests: migrate linux-explicit-synchronization

Moved to the new test harness.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
---
 tests/linux-explicit-synchronization-test.c | 20 ++++++++++++++++----
 tests/meson.build                           | 15 ++++++++-------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/tests/linux-explicit-synchronization-test.c b/tests/linux-explicit-synchronization-test.c
index 7ef122c6..4d4c24be 100644
--- a/tests/linux-explicit-synchronization-test.c
+++ b/tests/linux-explicit-synchronization-test.c
@@ -31,11 +31,23 @@
 #include "linux-explicit-synchronization-unstable-v1-client-protocol.h"
 #include "weston-test-client-helper.h"
 #include "wayland-server-protocol.h"
+#include "weston-test-fixture-compositor.h"
 
-/* We need to use the pixman renderer, since a few of the tests depend
- * on the renderer holding onto a surface buffer until the next one
- * is committed, which the noop renderer doesn't do. */
-char *server_parameters = "--use-pixman";
+static enum test_result_code
+fixture_setup(struct weston_test_harness *harness)
+{
+	struct compositor_setup setup;
+
+	compositor_setup_defaults(&setup);
+
+	/* We need to use the pixman renderer, since a few of the tests depend
+	 * on the renderer holding onto a surface buffer until the next one
+	 * is committed, which the noop renderer doesn't do. */
+	setup.renderer = RENDERER_PIXMAN;
+
+	return weston_test_harness_execute_as_client(harness, &setup);
+}
+DECLARE_FIXTURE_SETUP(fixture_setup);
 
 static struct zwp_linux_explicit_synchronization_v1 *
 get_linux_explicit_synchronization(struct client *client)
diff --git a/tests/meson.build b/tests/meson.build
index fc793ede..c84b885d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -124,6 +124,14 @@ tests = [
 			input_timestamps_unstable_v1_protocol_c,
 		],
 	},
+	{
+		'name': 'linux-explicit-synchronization',
+		'sources': [
+			'linux-explicit-synchronization-test.c',
+			linux_explicit_synchronization_unstable_v1_client_protocol_h,
+			linux_explicit_synchronization_unstable_v1_protocol_c,
+		],
+	},
 	{	'name': 'plugin-registry', },
 	{
 		'name': 'pointer',
@@ -193,13 +201,6 @@ tests_standalone = [
 ]
 
 tests_weston = [
-	[
-		'linux-explicit-synchronization',
-		[
-			linux_explicit_synchronization_unstable_v1_client_protocol_h,
-			linux_explicit_synchronization_unstable_v1_protocol_c,
-		]
-	],
 ]
 
 if get_option('xwayland')