From 4193bd660f5e1f1ae61e2a9d2f95afa97d48719c Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Thu, 2 May 2024 15:44:53 +0300 Subject: [PATCH] tests: Just keep PIXMAN as renderer No need to use both renderer for the tests, PIXMAN one is enough. For the kiosk-shell test which was recently added, but also for the older paint-node test. Signed-off-by: Marius Vlad --- tests/kiosk-shell-test.c | 22 +++------------------- tests/paint-node-test.c | 22 +++------------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/tests/kiosk-shell-test.c b/tests/kiosk-shell-test.c index 2bd7c347..9ab401b6 100644 --- a/tests/kiosk-shell-test.c +++ b/tests/kiosk-shell-test.c @@ -36,29 +36,13 @@ #include "weston-test-fixture-compositor.h" #include "xdg-shell-client-protocol.h" -struct setup_args { - struct fixture_metadata meta; - enum weston_renderer_type renderer; -}; - -static const struct setup_args my_setup_args[] = { - { - .renderer = WESTON_RENDERER_PIXMAN, - .meta.name = "pixman" - }, - { - .renderer = WESTON_RENDERER_GL, - .meta.name = "GL" - }, -}; - static enum test_result_code -fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg) +fixture_setup(struct weston_test_harness *harness) { struct compositor_setup setup; compositor_setup_defaults(&setup); - setup.renderer = arg->renderer; + setup.renderer = WESTON_RENDERER_PIXMAN; setup.width = 320; setup.height = 240; setup.shell = SHELL_KIOSK; @@ -67,7 +51,7 @@ fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg) return weston_test_harness_execute_as_client(harness, &setup); } -DECLARE_FIXTURE_SETUP_WITH_ARG(fixture_setup, my_setup_args, meta); +DECLARE_FIXTURE_SETUP(fixture_setup); diff --git a/tests/paint-node-test.c b/tests/paint-node-test.c index 2db81cef..33807a3c 100644 --- a/tests/paint-node-test.c +++ b/tests/paint-node-test.c @@ -33,29 +33,13 @@ #include "weston-test-client-helper.h" #include "weston-test-fixture-compositor.h" -struct setup_args { - struct fixture_metadata meta; - enum weston_renderer_type renderer; -}; - -static const struct setup_args my_setup_args[] = { - { - .renderer = WESTON_RENDERER_PIXMAN, - .meta.name = "pixman" - }, - { - .renderer = WESTON_RENDERER_GL, - .meta.name = "GL" - }, -}; - static enum test_result_code -fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg) +fixture_setup(struct weston_test_harness *harness) { struct compositor_setup setup; compositor_setup_defaults(&setup); - setup.renderer = arg->renderer; + setup.renderer = WESTON_RENDERER_PIXMAN; setup.width = 320; setup.height = 240; setup.shell = SHELL_TEST_DESKTOP; @@ -64,7 +48,7 @@ fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg) return weston_test_harness_execute_as_client(harness, &setup); } -DECLARE_FIXTURE_SETUP_WITH_ARG(fixture_setup, my_setup_args, meta); +DECLARE_FIXTURE_SETUP(fixture_setup); static struct buffer * surface_commit_color(struct client *client, struct wl_surface *surface,