From d355518fbb2a589deee56299928d15d5c4b870d2 Mon Sep 17 00:00:00 2001 From: Marek Chalupa Date: Tue, 19 Aug 2014 12:03:48 +0200 Subject: [PATCH 2/2] tests: fix event_loop_timer_updates It may happen that there's some time between the first and the other timer expire. If epoll_wait is called after the first timer expired and the other not, it returns only one source to dispatch and therefore the test fails. To fix that, sleep a while before wl_event_loop_dispatch() to make sure both timers expired. To be 100% sure, we could use poll() before calling wl_event_loop_dispatch(), but that would need modification in libwayland (need to get the source's fd somehow) https://bugs.freedesktop.org/show_bug.cgi?id=80594 Signed-off-by: Marek Chalupa --- tests/event-loop-test.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/event-loop-test.c b/tests/event-loop-test.c index bd85473..1a45db1 100644 --- a/tests/event-loop-test.c +++ b/tests/event-loop-test.c @@ -240,6 +240,8 @@ TEST(event_loop_timer) wl_event_loop_destroy(loop); } +#define MSEC_TO_USEC(msec) ((msec) * 1000) + struct timer_update_context { struct wl_event_source *source1, *source2; int count; @@ -291,6 +293,18 @@ TEST(event_loop_timer_updates) context.count = 0; + /* Since calling the functions between source2's update and + * wl_event_loop_dispatch() takes some time, it may happen + * that only one timer expires until we call epoll_wait. + * This naturally means that only one source is dispatched + * and the test fails. To fix that, sleep 15 ms before + * calling wl_event_loop_dispatch(). That should be enough + * for the second timer to expire. + * + * https://bugs.freedesktop.org/show_bug.cgi?id=80594 + */ + usleep(MSEC_TO_USEC(15)); + gettimeofday(&start_time, NULL); wl_event_loop_dispatch(loop, 20); gettimeofday(&end_time, NULL); -- 2.0.4