summaryrefslogtreecommitdiff
path: root/graphics/wayland/files/patch-tests_event-loop-test.c
blob: ab94166711680a6a1066f4e6bed3ce9f57d94fdb (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
--- tests/event-loop-test.c.orig	2015-07-06 19:38:51 UTC
+++ tests/event-loop-test.c
@@ -166,10 +166,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);
@@ -233,12 +233,20 @@ 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);
 }