mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2024-05-02 15:44:53 +03:00
parent 329f5f49e1
commit 4193bd660f
2 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/kiosk-shell-test.c
View File

@ -36,29 +36,13 @@
#include "weston-test-fixture-compositor.h" #include "weston-test-fixture-compositor.h"
#include "xdg-shell-client-protocol.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 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; struct compositor_setup setup;
compositor_setup_defaults(&setup); compositor_setup_defaults(&setup);
setup.renderer = arg->renderer; setup.renderer = WESTON_RENDERER_PIXMAN;
setup.width = 320; setup.width = 320;
setup.height = 240; setup.height = 240;
setup.shell = SHELL_KIOSK; 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); 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);

22
tests/paint-node-test.c
View File

@ -33,29 +33,13 @@
#include "weston-test-client-helper.h" #include "weston-test-client-helper.h"
#include "weston-test-fixture-compositor.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 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; struct compositor_setup setup;
compositor_setup_defaults(&setup); compositor_setup_defaults(&setup);
setup.renderer = arg->renderer; setup.renderer = WESTON_RENDERER_PIXMAN;
setup.width = 320; setup.width = 320;
setup.height = 240; setup.height = 240;
setup.shell = SHELL_TEST_DESKTOP; 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); 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 * static struct buffer *
surface_commit_color(struct client *client, struct wl_surface *surface, surface_commit_color(struct client *client, struct wl_surface *surface,