From 56b94b58947fab405952bbe03a881e1439dbcc26 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 13 Nov 2019 16:41:46 +0200 Subject: [PATCH] tests: migrate xwayland Move xwayland test to the new harness. This is the only test that can actually skip. It does it by exit(77) and that is fine, because there is only one test case in the file so far. To get rid of the exit() calls we need to return a value from the TEST() function but that is a big surgery for another time. Signed-off-by: Pekka Paalanen --- tests/meson.build | 5 ++++- tests/xwayland-test.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index c84b885d..5ae110de 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -208,7 +208,10 @@ if get_option('xwayland') if not d.found() error('Xwayland tests require libX11 which was not found. Or, you can use \'-Dxwayland=false\'.') endif - tests_weston += [ [ 'xwayland', [], d ] ] + tests += { + 'name': 'xwayland', + 'dep_objs': d, + } endif # Manual test plugin, not used in the automatic suite diff --git a/tests/xwayland-test.c b/tests/xwayland-test.c index af0b5bae..665f6ea7 100644 --- a/tests/xwayland-test.c +++ b/tests/xwayland-test.c @@ -42,6 +42,19 @@ #include #include "weston-test-runner.h" +#include "weston-test-fixture-compositor.h" + +static enum test_result_code +fixture_setup(struct weston_test_harness *harness) +{ + struct compositor_setup setup; + + compositor_setup_defaults(&setup); + setup.xwayland = true; + + return weston_test_harness_execute_as_client(harness, &setup); +} +DECLARE_FIXTURE_SETUP(fixture_setup); TEST(xwayland_client_test) {