fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-06 09:08:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Don't leak test idle source on full-skip

Browse source 
If the compositor fails to initialise in such a way that we want to
skip, don't leak the idle source.

This fixes the ASan failure, but still results in a TAP-parsing failure.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2026-04-09 00:19:26 +01:00
parent 6f709a43b9
commit ccefe3ef45
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/harness/weston-test.c
View file

@ -69,6 +69,8 @@ struct weston_test {
struct wl_list output_list;
struct wl_listener output_created_listener;
struct wl_listener output_destroyed_listener;
struct wl_event_source *launch_source;
};
struct weston_test_surface {
@ -776,6 +778,8 @@ idle_launch_testsuite(void *test_)
struct weston_test *test = test_;
struct wet_testsuite_data *data = weston_compositor_get_test_data(test->compositor);
test->launch_source = NULL;
if (!data)
return;
@ -832,6 +836,13 @@ handle_compositor_destroy(struct wl_listener *listener,
client_thread_join(test);
}
if (test->launch_source) {
weston_log_scope_printf(test->log,
"Test cancelled during initialization\n");
wl_event_source_remove(test->launch_source);
test->launch_source = NULL;
}
if (test->is_seat_initialized)
test_seat_release(test);
@ -888,7 +899,8 @@ wet_module_init(struct weston_compositor *ec,
goto out_free;
loop = wl_display_get_event_loop(ec->wl_display);
wl_event_loop_add_idle(loop, idle_launch_testsuite, test);
test->launch_source =
wl_event_loop_add_idle(loop, idle_launch_testsuite, test);
return 0;