Test: Use a xvfb wrapper for x11 test #348
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wismill
added
the
testing
whot
reviewed
Jun 27, 2023
wismill
force-pushed
the
wip/test/use-xvfb-for-x11-test
branch
from
5cc9f26
to
ff2b1dc
Compare
Closed
|
I closed #339 in favour of this PR. |
bluetech
approved these changes
Jun 30, 2023
I think it's not necessary. |
wismill
force-pushed
the
wip/test/use-xvfb-for-x11-test
branch
from
9ea7271
to
975c05b
Compare
Closed
whot
approved these changes
Jul 4, 2023
| kill(xvfb_pid, SIGTERM); | ||
| fclose(display_fd); | ||
| err_display_fd: | ||
| return ret; |
There was a problem hiding this comment.
minor nitpick: if you declare and init the pid and fd variables to 0/-1 at the top of the functions, you can have a single error: label that kills and closes since they're at default values. slight simplification
There was a problem hiding this comment.
Not sure of this: I get a warning if I set display_fd to -1. We surely do not want to depend on undefined behaviour.
The x11 test is currently silently skipped in CI, because it requires a running X server. Create a xvfb wrapper to run the test. We do not use `xvfb-run`, because it is a shell script and it causes valgrind to detect unrelated memory issues in the shell (dash, bash). Improve wrapper using a special ELF section TODO: The wrapper is intended to be used with the x11comp test as well.
Based on the work done by Peter Hutterer. Original commit message: If SIGUSR1 is set to SIG_IGN, X servers (all of them, including Xvfb) will send that signal to the parent process when they're ready to accept connections. We can use that instead of a hardcoded sleep which brings the wait down to ~37ms on my box.
This test was previously disabled in 914e84e. Note that it requires a recent version of xkeyboard-config to succeed.
xkeyboard-config and xkbcommon projects are quite intertwined so we want things to blow up early. It also solves an issue with the x11comp test.
wismill
force-pushed
the
wip/test/use-xvfb-for-x11-test
branch
from
1733d90
to
76b3799
Compare
|
Rebased & improved commits. Review done and tests passed. Let’s merge! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The X11 test is currently silently skipped in CI. Use a
xvfbwrapper to ensure to run it. See #339 for the rationale.The code is adapted from #339
and it is intended to be rebased on it, then refactor the x11comp test as well with the wrapper, which is closed in favour of this new PR.Question: should we use an option to disable the wrapper, in order to test with a local X11 server as previously?