diff options
| author | Marek Chalupa <mchqwerty@gmail.com> | 2014-07-16 11:32:50 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2014-07-22 19:15:28 +0300 |
| commit | 1740aa8c85534c0b0a6695f808fe53a6f96f9443 (patch) | |
| tree | d638e499ff62c7dd3eca4de0f03d30bf8abfd599 /tests/weston-test-client-helper.c | |
| parent | 4d06d46ace7016dd6bed82bb60c56d00ac5ae4b9 (diff) | |
| download | weston-1740aa8c85534c0b0a6695f808fe53a6f96f9443.tar.gz | |
tests: add frame_callback_wait_nofail
With expect_protocol_error, we need a possibility to wait for a frame
without aborting the test when wl_display_dispatch returns -1;
This patch adds function frame_callback_wait_nofail that only
returns 1 or 0 (instead of aborting on error).
Reviewed-by: Pekka Paalanen <ppaalanen@gmail.com>
Diffstat (limited to 'tests/weston-test-client-helper.c')
| -rw-r--r-- | tests/weston-test-client-helper.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c index 92cee9f0..79097fa1 100644 --- a/tests/weston-test-client-helper.c +++ b/tests/weston-test-client-helper.c @@ -80,12 +80,15 @@ frame_callback_set(struct wl_surface *surface, int *done) return callback; } -void -frame_callback_wait(struct client *client, int *done) +int +frame_callback_wait_nofail(struct client *client, int *done) { while (!*done) { - assert(wl_display_dispatch(client->wl_display) >= 0); + if (wl_display_dispatch(client->wl_display) < 0) + return 0; } + + return 1; } void |