Abi is backward compatible: https://abi-laboratory.pro/tracker/timeline/wayland/ Port changes: - Allow memfd_create on FreeBSD 13 for sealing - Drop ms_timeout workaround in favor of upstream fix[1] - Drop posix_fallocate patch as it was disabled in r455878 - Adjust posix_fallocate comment to improve clarity - Temporarily revert event loop update until epoll-shim#15 [2] is fixed [1]: https://gitlab.freedesktop.org/wayland/wayland/commit/75d14834570b [2]: https://github.com/jiixyj/epoll-shim/issues/15 Build tested on: 11.3 aarch64 11.3 amd64 11.3 armv6 11.3 i386 12.0 amd64 12.0 i386 12.1 aarch64 12.1 amd64 12.1 armv6 12.1 armv7 12.1 i386 13.0 amd64 13.0 i386 Base GCC 4.2.1 (mimics powerpc*, mips*, riscv64) Run tested with: multimedia/libva-intel-driver multimedia/mpv www/firefox + MOZ_ENABLE_WAYLAND x11-servers/xwayland-devel x11-wm/cage x11-wm/sway x11/wl-clipboard PR: 244059 Submitted by: jbeich Tested by: manu Reviewed by: manu Approved by: x11 (bapt) Differential Revision: https://reviews.freebsd.org/D23643
44 lines
1.5 KiB
C
44 lines
1.5 KiB
C
--- tests/event-loop-test.c.orig 2020-02-11 23:46:03 UTC
|
|
+++ tests/event-loop-test.c
|
|
@@ -168,10 +168,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);
|
|
@@ -235,11 +235,11 @@ TEST(event_loop_timer)
|
|
|
|
source1 = wl_event_loop_add_timer(loop, timer_callback, &got_it);
|
|
assert(source1);
|
|
- wl_event_source_timer_update(source1, 20);
|
|
+ assert(wl_event_source_timer_update(source1, 20) == 0);
|
|
|
|
source2 = wl_event_loop_add_timer(loop, timer_callback, &got_it);
|
|
assert(source2);
|
|
- wl_event_source_timer_update(source2, 100);
|
|
+ assert(wl_event_source_timer_update(source2, 100) == 0);
|
|
|
|
/* Check that the timer marked for 20 msec from now fires within 30
|
|
* msec, and that the timer marked for 100 msec is expected to fire
|
|
@@ -248,11 +248,11 @@ TEST(event_loop_timer)
|
|
|
|
wl_event_loop_dispatch(loop, 0);
|
|
assert(got_it == 0);
|
|
- wl_event_loop_dispatch(loop, 30);
|
|
+ assert(wl_event_loop_dispatch(loop, 30) == 0);
|
|
assert(got_it == 1);
|
|
wl_event_loop_dispatch(loop, 0);
|
|
assert(got_it == 1);
|
|
- wl_event_loop_dispatch(loop, 90);
|
|
+ assert(wl_event_loop_dispatch(loop, 90) == 0);
|
|
assert(got_it == 2);
|
|
|
|
wl_event_source_remove(source1);
|