From 10a2787a714e3e4eae7fbbdf98b19abf6c0b45e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 3 Aug 2022 18:42:04 +0200 Subject: [PATCH] tests/runner: Remove support running tests as an X11 WM This hasn't worked for a while, since the test always runs the nested backend, meaning it's a Wayland compositor. To unblock testing window management in combination to monitor changes, lets remove the unreachable X11 WM paths, so that we can start using virtual monitors. Part-of: --- src/tests/test-runner.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c index c691ef6ef..84992a23e 100644 --- a/src/tests/test-runner.c +++ b/src/tests/test-runner.c @@ -82,20 +82,16 @@ test_case_new (MetaContext *context) TestCase *test = g_new0 (TestCase, 1); MetaDisplay *display = meta_context_get_display (context); - if (!meta_is_wayland_compositor ()) + if (display->x11_display) { - meta_context_test_wait_for_x11_display (META_CONTEXT_TEST (context)); on_x11_display_opened (display, test); } else { - if (display->x11_display) - on_x11_display_opened (display, test); - else - test->x11_display_opened_handler_id = - g_signal_connect (meta_get_display (), "x11-display-opened", - G_CALLBACK (on_x11_display_opened), - test); + test->x11_display_opened_handler_id = + g_signal_connect (meta_get_display (), "x11-display-opened", + G_CALLBACK (on_x11_display_opened), + test); } test->context = context;