[Bug 243649] [patch] devel/libepoll-shim: Update to 0.0.20191117 version to unbreak re-plugging input devices

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243649

--- Comment #14 from Jan Beich <[email protected]> ---
Comment on attachment 211521
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=211521
Patch to change libepoll-shim to use actual upstream, test targets, update to
20191117, even more cosmetic changes

(In reply to Michael Gmelin from comment #13)
> The new version of the patch includes the changes of
> that pull request and therefore fixes unit tests
> on i386.

Thanks!

> --- devel/libepoll-shim/files/patch-test_epoll-test.c	(nonexistent)
> +++ devel/libepoll-shim/files/patch-test_epoll-test.c	(working copy)
> @@ -0,0 +1,18 @@
> +https://github.com/jiixyj/epoll-shim/commit/0f1665e12f2de53bb49a24415f033a60a4a381d1.diff
[...]
> --- devel/libepoll-shim/files/patch-test_tst-eventfd.c	(nonexistent)
> +++ devel/libepoll-shim/files/patch-test_tst-eventfd.c	(working copy)
> @@ -0,0 +1,14 @@
> +https://github.com/jiixyj/epoll-shim/commit/0f1665e12f2de53bb49a24415f033a60a4a381d1.diff
[...]

Why not simplify into the following then run "make makesum"? Whoever updates
next then only needs to check if your PR was merged.

  PATCH_SITES=  https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
  PATCHFILES+=  0f1665e12f2d.patch:-p1 #
https://github.com/jiixyj/epoll-shim/pull/14

> +do-test:
> +	# Exclude certain tests in resource restricted environments
> +	@(if [ `ulimit -n` -lt 20100 ]; then \
> +	    SKIP_TESTS="-E ^(perf-many-fds.perf_many_fds__perf"; \
> +	    if [ `ulimit -n` -lt 1100 ]; then \
> +	        SKIP_TESTS=$$SKIP_TESTS"|timerfd-test.timerfd__many_timers"; \
> +	    fi; \
> +	    SKIP_TESTS=$$SKIP_TESTS")$$"; \
> +	fi; \

Looks ugly but so is checking getrlimit(RLIMIT_NOFILE) in source or
USES=cmake:noninja while passing ctest arguments via ARGS variable. I can't
suggest anything better.

> +	cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} $$SKIP_TESTS)

Prepend ${TEST_ENV} before ctest command to sanitize HOME.

-- 
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[email protected]"