wayland/files/patch-tests_event-loop-test.c

--- tests/event-loop-test.c.orig        2017-08-08 18:20:52 UTC
+++ tests/event-loop-test.c
@@ -167,10 +167,10 @@ TEST(event_loop_signal)
                                          signal_callback, &got_it);
        assert(source);
 
-       wl_event_loop_dispatch(loop, 0);
+       assert(wl_event_loop_dispatch(loop, 0) == 0);
        assert(!got_it);
-       kill(getpid(), SIGUSR1);
-       wl_event_loop_dispatch(loop, 0);
+       assert(kill(getpid(), SIGUSR1) == 0);
+       assert(wl_event_loop_dispatch(loop, 0) == 0);
        assert(got_it == 1);
 
        wl_event_source_remove(source);
@@ -234,11 +234,19 @@ TEST(event_loop_timer)
 
        source = wl_event_loop_add_timer(loop, timer_callback, &got_it);
        assert(source);
-       wl_event_source_timer_update(source, 10);
-       wl_event_loop_dispatch(loop, 0);
+       assert(wl_event_source_timer_update(source, 10) == 0);
+       assert(wl_event_loop_dispatch(loop, 0) == 0);
        assert(!got_it);
-       wl_event_loop_dispatch(loop, 20);
+       /* FreeBSD has a bug where it converts ms_timeout to ticks; it always adds 1 to the tick count.
+       * Consequently, we need to grossly overcompensate here.
+       * See: http://unix.derkeiler.com/Mailing-Lists/FreeBSD/hackers/2012-07/msg00319.html */
+       assert(wl_event_loop_dispatch(loop, 50) == 0);
        assert(got_it == 1);
+
+       /* Check it doesn't fire again. */
+       got_it = 0;
+       assert(wl_event_loop_dispatch(loop, 20) == 0);
+       assert(!got_it);
 
        wl_event_source_remove(source);
        wl_event_loop_destroy(loop);
Revision:	24082
Committed:	Sun Sep 2 21:45:30 2018 UTC (5 years, 7 months ago) by laffer1
Content type:	text/plain
File size:	1374 byte(s)
Log Message:	move wayland
#	Content
1	--- tests/event-loop-test.c.orig 2017-08-08 18:20:52 UTC
2	+++ tests/event-loop-test.c
3	@@ -167,10 +167,10 @@ TEST(event_loop_signal)
4	signal_callback, &got_it);
5	assert(source);
6
7	- wl_event_loop_dispatch(loop, 0);
8	+ assert(wl_event_loop_dispatch(loop, 0) == 0);
9	assert(!got_it);
10	- kill(getpid(), SIGUSR1);
11	- wl_event_loop_dispatch(loop, 0);
12	+ assert(kill(getpid(), SIGUSR1) == 0);
13	+ assert(wl_event_loop_dispatch(loop, 0) == 0);
14	assert(got_it == 1);
15
16	wl_event_source_remove(source);
17	@@ -234,11 +234,19 @@ TEST(event_loop_timer)
18
19	source = wl_event_loop_add_timer(loop, timer_callback, &got_it);
20	assert(source);
21	- wl_event_source_timer_update(source, 10);
22	- wl_event_loop_dispatch(loop, 0);
23	+ assert(wl_event_source_timer_update(source, 10) == 0);
24	+ assert(wl_event_loop_dispatch(loop, 0) == 0);
25	assert(!got_it);
26	- wl_event_loop_dispatch(loop, 20);
27	+ /* FreeBSD has a bug where it converts ms_timeout to ticks; it always adds 1 to the tick count.
28	+ * Consequently, we need to grossly overcompensate here.
29	+ * See: http://unix.derkeiler.com/Mailing-Lists/FreeBSD/hackers/2012-07/msg00319.html */
30	+ assert(wl_event_loop_dispatch(loop, 50) == 0);
31	assert(got_it == 1);
32	+
33	+ /* Check it doesn't fire again. */
34	+ got_it = 0;
35	+ assert(wl_event_loop_dispatch(loop, 20) == 0);
36	+ assert(!got_it);
37
38	wl_event_source_remove(source);
39	wl_event_loop_destroy(loop);