fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 03:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: bail on dispatch failure

Browse source 
Originally the test-asserts were abort()'ing. Then they were changed to
record the failure but not abort() anymore. These loops were missed,
accidentally turning them into endless loops on Wayland connection
failure, e.g. a protocol error.

When then loops become endless, they will repeatedly print the assertion
failure message. When run as part of the test suite via Meson, Meson
will collect all printouts in memory. Therefore the meson process will
use memory rapidly without bounds.

Break all these loops.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2025-12-04 18:20:27 +02:00
parent 4b61e44ad1
commit 015d73cb54
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/color-management-parametric-test.c
View file

@ -721,7 +721,8 @@ TEST_P(create_parametric_image_description, good_test_cases)
image_desc_creator_param = NULL; image_desc_creator_param = NULL;
while (image_desc->status == CM_IMAGE_DESC_NOT_CREATED) while (image_desc->status == CM_IMAGE_DESC_NOT_CREATED)
test_assert_int_ge(wl_display_dispatch(client->wl_display), 0); if (!test_assert_int_ge(wl_display_dispatch(client->wl_display), 0))
return RESULT_FAIL;
test_assert_enum(image_desc->status, CM_IMAGE_DESC_READY); test_assert_enum(image_desc->status, CM_IMAGE_DESC_READY);
image_description_destroy(image_desc); image_description_destroy(image_desc);
@ -837,7 +838,8 @@ TEST_P(fail_to_create_parametric_image_description, bad_test_cases)
} }
while (image_desc->status == CM_IMAGE_DESC_NOT_CREATED) while (image_desc->status == CM_IMAGE_DESC_NOT_CREATED)
test_assert_int_ge(wl_display_dispatch(client->wl_display), 0); if (!test_assert_int_ge(wl_display_dispatch(client->wl_display), 0))
return RESULT_FAIL;
/* This TEST() is for bad params, so we shouldn't be able to /* This TEST() is for bad params, so we shouldn't be able to
* successfully create an image description. */ * successfully create an image description. */

3
tests/color-management-test.c
View file

@ -784,7 +784,8 @@ wait_until_image_description_ready(struct client *client,
struct image_description *image_descr) struct image_description *image_descr)
{ {
while (image_descr->status == CM_IMAGE_DESC_NOT_CREATED) while (image_descr->status == CM_IMAGE_DESC_NOT_CREATED)
test_assert_int_ge(wl_display_dispatch(client->wl_display), 0); if (!test_assert_int_ge(wl_display_dispatch(client->wl_display), 0))
break;
test_assert_enum(image_descr->status, CM_IMAGE_DESC_READY); test_assert_enum(image_descr->status, CM_IMAGE_DESC_READY);
} }

9
tests/output-capture-protocol-test.c
View file

@ -249,7 +249,8 @@ TEST(simple_shot)
weston_capture_source_v1_capture(capt->source, buf->proxy); weston_capture_source_v1_capture(capt->source, buf->proxy);
while (!capt->events.reply) while (!capt->events.reply)
test_assert_int_ge(wl_display_dispatch(client->wl_display), 0); if (!test_assert_int_ge(wl_display_dispatch(client->wl_display), 0))
return RESULT_FAIL;
test_assert_enum(capt->state, CAPTURE_TASK_COMPLETE); test_assert_enum(capt->state, CAPTURE_TASK_COMPLETE);
@ -292,7 +293,8 @@ TEST(retry_on_wrong_format)
weston_capture_source_v1_capture(capt->source, buf->proxy); weston_capture_source_v1_capture(capt->source, buf->proxy);
while (!capt->events.reply) while (!capt->events.reply)
test_assert_int_ge(wl_display_dispatch(client->wl_display), 0); if (!test_assert_int_ge(wl_display_dispatch(client->wl_display), 0))
return RESULT_FAIL;
test_assert_enum(capt->state, CAPTURE_TASK_RETRY); test_assert_enum(capt->state, CAPTURE_TASK_RETRY);
@ -331,7 +333,8 @@ TEST(retry_on_wrong_size)
weston_capture_source_v1_capture(capt->source, buf->proxy); weston_capture_source_v1_capture(capt->source, buf->proxy);
while (!capt->events.reply) while (!capt->events.reply)
test_assert_int_ge(wl_display_dispatch(client->wl_display), 0); if (!test_assert_int_ge(wl_display_dispatch(client->wl_display), 0))
return RESULT_FAIL;
test_assert_enum(capt->state, CAPTURE_TASK_RETRY); test_assert_enum(capt->state, CAPTURE_TASK_RETRY);

3
tests/presentation-test.c
View file

@ -165,7 +165,8 @@ static void
feedback_wait(struct feedback *fb) feedback_wait(struct feedback *fb)
{ {
while (fb->result == FB_PENDING) { while (fb->result == FB_PENDING) {
test_assert_int_ge(wl_display_dispatch(fb->client->wl_display), 0); if (!test_assert_int_ge(wl_display_dispatch(fb->client->wl_display), 0))
break;
} }
} }