From 69c7ca02f4291065a4fc484f610ed6cbe155ee32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 25 Mar 2024 13:17:46 +0100 Subject: [PATCH] tests/wayland: Replace wl_display_dispatch() with helper In most cases, we just want to fail the test if dispatching fails, so add a helper that does that. Part-of: --- .../wayland-test-clients/buffer-transform.c | 5 +---- .../wayland-test-clients/dma-buf-scanout.c | 5 +---- .../wayland-test-clients/fractional-scale.c | 5 +---- src/tests/wayland-test-clients/fullscreen.c | 5 +---- .../kms-cursor-hotplug-helper.c | 5 +---- .../wayland-test-clients/service-client.c | 5 +---- .../single-pixel-buffer.c | 10 ++------- .../subsurface-corner-cases.c | 5 +---- .../subsurface-parent-unmapped.c | 5 +---- .../subsurface-remap-toplevel.c | 5 +---- .../subsurface-reparenting.c | 5 +---- .../wayland-test-client-utils.c | 22 +++++++++---------- .../wayland-test-client-utils.h | 2 ++ .../wayland-test-clients/xdg-activation.c | 5 +---- .../wayland-test-clients/xdg-apply-limits.c | 5 +---- src/tests/wayland-test-clients/xdg-foreign.c | 10 ++------- .../xdg-toplevel-bounds.c | 5 +---- src/tests/wayland-test-clients/ycbcr.c | 5 +---- 18 files changed, 30 insertions(+), 84 deletions(-) diff --git a/src/tests/wayland-test-clients/buffer-transform.c b/src/tests/wayland-test-clients/buffer-transform.c index 8591e88d6..1f5c24efa 100644 --- a/src/tests/wayland-test-clients/buffer-transform.c +++ b/src/tests/wayland-test-clients/buffer-transform.c @@ -140,10 +140,7 @@ wait_for_configure (WaylandDisplay *display) { waiting_for_configure = TRUE; while (waiting_for_configure || window_width == 0) - { - if (wl_display_dispatch (display->display) == -1) - exit (EXIT_FAILURE); - } + wayland_display_dispatch (display); } int diff --git a/src/tests/wayland-test-clients/dma-buf-scanout.c b/src/tests/wayland-test-clients/dma-buf-scanout.c index d71763947..b92ee3229 100644 --- a/src/tests/wayland-test-clients/dma-buf-scanout.c +++ b/src/tests/wayland-test-clients/dma-buf-scanout.c @@ -242,10 +242,7 @@ main (int argc, running = TRUE; while (running) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); g_list_free_full (active_buffers, (GDestroyNotify) g_object_unref); diff --git a/src/tests/wayland-test-clients/fractional-scale.c b/src/tests/wayland-test-clients/fractional-scale.c index f62aa2033..8594bd9ed 100644 --- a/src/tests/wayland-test-clients/fractional-scale.c +++ b/src/tests/wayland-test-clients/fractional-scale.c @@ -177,10 +177,7 @@ main (int argc, running = TRUE; while (running) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); wl_display_roundtrip (display->display); diff --git a/src/tests/wayland-test-clients/fullscreen.c b/src/tests/wayland-test-clients/fullscreen.c index 804be4eb2..5ca10ee49 100644 --- a/src/tests/wayland-test-clients/fullscreen.c +++ b/src/tests/wayland-test-clients/fullscreen.c @@ -97,10 +97,7 @@ main (int argc, running = TRUE; while (running) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); wl_display_roundtrip (display->display); diff --git a/src/tests/wayland-test-clients/kms-cursor-hotplug-helper.c b/src/tests/wayland-test-clients/kms-cursor-hotplug-helper.c index b46a88563..abd515f2f 100644 --- a/src/tests/wayland-test-clients/kms-cursor-hotplug-helper.c +++ b/src/tests/wayland-test-clients/kms-cursor-hotplug-helper.c @@ -279,10 +279,7 @@ main (int argc, running = TRUE; while (running) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); return EXIT_SUCCESS; } diff --git a/src/tests/wayland-test-clients/service-client.c b/src/tests/wayland-test-clients/service-client.c index 65f0b0726..44c645be8 100644 --- a/src/tests/wayland-test-clients/service-client.c +++ b/src/tests/wayland-test-clients/service-client.c @@ -88,10 +88,7 @@ main (int argc, wl_surface_commit (surface->wl_surface); while (last_sync_event != 1) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); g_object_unref (surface); g_object_unref (display); diff --git a/src/tests/wayland-test-clients/single-pixel-buffer.c b/src/tests/wayland-test-clients/single-pixel-buffer.c index d350e4d8e..7c151bbb3 100644 --- a/src/tests/wayland-test-clients/single-pixel-buffer.c +++ b/src/tests/wayland-test-clients/single-pixel-buffer.c @@ -89,10 +89,7 @@ wait_for_configure (WaylandDisplay *display) { waiting_for_configure = TRUE; while (waiting_for_configure || window_width == 0) - { - if (wl_display_dispatch (display->display) == -1) - exit (EXIT_FAILURE); - } + wayland_display_dispatch (display); } static void @@ -111,10 +108,7 @@ static void wait_for_buffer_released (WaylandDisplay *display) { while (buffer) - { - if (wl_display_dispatch (display->display) == -1) - g_error ("%s: Failed to dispatch Wayland display", __func__); - } + wayland_display_dispatch (display); } int diff --git a/src/tests/wayland-test-clients/subsurface-corner-cases.c b/src/tests/wayland-test-clients/subsurface-corner-cases.c index 449bcb83d..2ae040f13 100644 --- a/src/tests/wayland-test-clients/subsurface-corner-cases.c +++ b/src/tests/wayland-test-clients/subsurface-corner-cases.c @@ -114,10 +114,7 @@ wait_for_configure (WaylandDisplay *display) { waiting_for_configure = TRUE; while (waiting_for_configure || window_width == 0) - { - if (wl_display_dispatch (display->display) == -1) - exit (EXIT_FAILURE); - } + wayland_display_dispatch (display); } int diff --git a/src/tests/wayland-test-clients/subsurface-parent-unmapped.c b/src/tests/wayland-test-clients/subsurface-parent-unmapped.c index 40c72ea33..510138ab8 100644 --- a/src/tests/wayland-test-clients/subsurface-parent-unmapped.c +++ b/src/tests/wayland-test-clients/subsurface-parent-unmapped.c @@ -337,10 +337,7 @@ main (int argc, wl_subsurface_set_desync (subsurface); while (TRUE) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); return EXIT_SUCCESS; } diff --git a/src/tests/wayland-test-clients/subsurface-remap-toplevel.c b/src/tests/wayland-test-clients/subsurface-remap-toplevel.c index c1bb90ea5..b16ff0cc5 100644 --- a/src/tests/wayland-test-clients/subsurface-remap-toplevel.c +++ b/src/tests/wayland-test-clients/subsurface-remap-toplevel.c @@ -209,10 +209,7 @@ main (int argc, running = TRUE; while (running) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); return EXIT_SUCCESS; } diff --git a/src/tests/wayland-test-clients/subsurface-reparenting.c b/src/tests/wayland-test-clients/subsurface-reparenting.c index 7a4c99577..c10ec67df 100644 --- a/src/tests/wayland-test-clients/subsurface-reparenting.c +++ b/src/tests/wayland-test-clients/subsurface-reparenting.c @@ -204,10 +204,7 @@ main (int argc, state = STATE_WAIT_FOR_CONFIGURE_1; while (TRUE) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); return EXIT_SUCCESS; } diff --git a/src/tests/wayland-test-clients/wayland-test-client-utils.c b/src/tests/wayland-test-clients/wayland-test-client-utils.c index fc205587e..065af8fd3 100644 --- a/src/tests/wayland-test-clients/wayland-test-client-utils.c +++ b/src/tests/wayland-test-clients/wayland-test-client-utils.c @@ -426,6 +426,13 @@ wayland_display_new (WaylandDisplayCapabilities capabilities) wl_display_connect (NULL)); } +void +wayland_display_dispatch (WaylandDisplay *display) +{ + if (wl_display_dispatch (display->display) == -1) + g_error ("wl_display_dispatch failed"); +} + static void wayland_display_finalize (GObject *object) { @@ -632,10 +639,7 @@ wait_for_effects_completed (WaylandDisplay *display, NULL); while (effects_complete_callback) - { - if (wl_display_dispatch (display->display) == -1) - g_error ("%s: Failed to dispatch Wayland display", __func__); - } + wayland_display_dispatch (display); } static void @@ -688,10 +692,7 @@ wait_for_view_verified (WaylandDisplay *display, &view_verification_listener, NULL); while (view_verification_callback) - { - if (wl_display_dispatch (display->display) == -1) - g_error ("%s: Failed to dispatch Wayland display", __func__); - } + wayland_display_dispatch (display); } static void @@ -711,10 +712,7 @@ wait_for_sync_event (WaylandDisplay *display, handler_id = g_signal_connect (display, "sync-event", G_CALLBACK (on_sync_event), NULL); while (expected_serial + 1 > display->sync_event_serial_next) - { - if (wl_display_dispatch (display->display) == -1) - g_error ("%s: Failed to dispatch Wayland display", __func__); - } + wayland_display_dispatch (display); g_signal_handler_disconnect (display, handler_id); } diff --git a/src/tests/wayland-test-clients/wayland-test-client-utils.h b/src/tests/wayland-test-clients/wayland-test-client-utils.h index 42a3fd802..a6f091f26 100644 --- a/src/tests/wayland-test-clients/wayland-test-client-utils.h +++ b/src/tests/wayland-test-clients/wayland-test-client-utils.h @@ -95,6 +95,8 @@ WaylandDisplay * wayland_display_new (WaylandDisplayCapabilities capabilities); WaylandDisplay * wayland_display_new_full (WaylandDisplayCapabilities capabilities, struct wl_display *wayland_display); +void wayland_display_dispatch (WaylandDisplay *display); + WaylandSurface * wayland_surface_new (WaylandDisplay *display, const char *title, int default_width, diff --git a/src/tests/wayland-test-clients/xdg-activation.c b/src/tests/wayland-test-clients/xdg-activation.c index b97a599c2..5413e7406 100644 --- a/src/tests/wayland-test-clients/xdg-activation.c +++ b/src/tests/wayland-test-clients/xdg-activation.c @@ -178,10 +178,7 @@ test_startup_notifications (void) running = TRUE; while (running) - { - if (wl_display_dispatch (display->display) == -1) - return; - } + wayland_display_dispatch (display); wl_display_roundtrip (display->display); diff --git a/src/tests/wayland-test-clients/xdg-apply-limits.c b/src/tests/wayland-test-clients/xdg-apply-limits.c index 9c30bfe4a..96c3a04e6 100644 --- a/src/tests/wayland-test-clients/xdg-apply-limits.c +++ b/src/tests/wayland-test-clients/xdg-apply-limits.c @@ -221,10 +221,7 @@ main (int argc, running = TRUE; while (running) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); return EXIT_SUCCESS; } diff --git a/src/tests/wayland-test-clients/xdg-foreign.c b/src/tests/wayland-test-clients/xdg-foreign.c index 0a5dacf89..7c01fa8bf 100644 --- a/src/tests/wayland-test-clients/xdg-foreign.c +++ b/src/tests/wayland-test-clients/xdg-foreign.c @@ -171,10 +171,7 @@ main (int argc, zxdg_exported_v2_add_listener (exported3, &exported_v2_listener, &handle3); while (!handle1 && !handle3) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); zxdg_importer_v2_import_toplevel (importer_v2, "don't crash on bogus handle"); zxdg_importer_v1_import (importer_v1, "don't crash on bogus handle"); @@ -216,10 +213,7 @@ main (int argc, zxdg_exported_v2_destroy (exported3); while (!imported1_destroyed || !imported3_destroyed) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); return EXIT_SUCCESS; } diff --git a/src/tests/wayland-test-clients/xdg-toplevel-bounds.c b/src/tests/wayland-test-clients/xdg-toplevel-bounds.c index d3c72dad6..4c5fed710 100644 --- a/src/tests/wayland-test-clients/xdg-toplevel-bounds.c +++ b/src/tests/wayland-test-clients/xdg-toplevel-bounds.c @@ -177,10 +177,7 @@ main (int argc, running = TRUE; while (running) - { - if (wl_display_dispatch (display->display) == -1) - return EXIT_FAILURE; - } + wayland_display_dispatch (display); return EXIT_SUCCESS; } diff --git a/src/tests/wayland-test-clients/ycbcr.c b/src/tests/wayland-test-clients/ycbcr.c index 3ce3ec642..ba71f3e7a 100644 --- a/src/tests/wayland-test-clients/ycbcr.c +++ b/src/tests/wayland-test-clients/ycbcr.c @@ -183,10 +183,7 @@ wait_for_configure (WaylandDisplay *display) { waiting_for_configure = TRUE; while (waiting_for_configure) - { - if (wl_display_dispatch (display->display) == -1) - exit (EXIT_FAILURE); - } + wayland_display_dispatch (display); } int