Re-enable x11comp test #339

wismill · 2023-05-10T10:01:16Z

This test works on my machine, let’s see if it works on our CI.

Fixes #30

wismill · 2023-05-10T15:31:21Z

I simplified the test by wrapping it with xvfb-run. Unfortunately, there is currently a Github incident so the CI is not running. Wait and see

wismill · 2023-05-11T08:03:16Z

I am doing some trials locally, but I encounter a weird bug that seems to be https://gitlab.freedesktop.org/xorg/xserver/-/issues/1249.

It may be the same bug that triggers with this test when using xkbcomp. I do not think there is much we can do for now…

bluetech · 2023-05-12T20:37:16Z

Seems like the bug you linked to was fixed by @whot some months ago, I guess the xserver in CI is too old to include it? I just updated the CI linux job to run on the latest ubuntu (22.04); it's probably too old as well, but worth a try anyway to rebase on master and see what happens.

wismill · 2023-05-13T06:27:16Z

IIRC, I already tried 22.04 locally and the issue was still there.

bluetech · 2023-05-13T19:01:58Z

Then I'll guess we'll have to wait a few more year :)

However, if there are changes you want to make to the test, while still skipping it for now, let me know, we can merge that.

wismill · 2023-05-13T19:08:45Z

It's not ready to merge. Maybe the only change worth to notice is the use of xvfb-run.

whot · 2023-05-28T22:40:34Z

I guess the xserver in CI is too old to include it?

Looks like it should be included, at least in 22.04:

xserver $ git tag --contains 2c6989f81e62bac05a583c39fa09a06172d1ece5
xorg-server-21.1.2
xorg-server-21.1.3
xorg-server-21.1.4
...

Note this is the cherry-pick commit of that patch so it only lists the 21.1.x releases. The ubuntu package includes 21.1.3 atm. So this should work if it's the same bug.

But checking the workflow yaml file: we don't appear to be installing X on purpose, might be good to have this listed explicitly. maybe it's pulled in by graphviz?

Anyway, testlog shows it does indeed run but otherwise the output is not very useful. Best way to reproduce locally would be with

$ podman  run --rm -it ubuntu:22.04

and then install the dependencies and run in that container. At least that way it can be debugged interactively instead of having short meson logs.

wismill · 2023-06-21T11:17:28Z

@whot @bluetech I think I finally make it work!

Some comments:

I initially tried to use xvfb-run, but it turns out to be problematic with valgrind: some memory issues with dash.
Linux CI: For some reasons it does not work with older versions of xkb-data package, i.e. xkeyboard-config. I do not know which one precisely, but it seems 2.38 (Ubuntu 23.04) and 2.39 work. I use a hack to override the system version. Not pretty, but it works. Do you have a better idea?
macOS CI: for some reason unrelated to my modifications this CI started to fail. Any idea?

.github/workflows/linux.yml

test/x11comp.c

whot · 2023-06-23T03:36:00Z

.github/workflows/linux.yml

-            libwayland-dev wayland-protocols bison graphviz
+            doxygen libxcb-xkb-dev valgrind ninja-build meson \
+            libwayland-dev wayland-protocols bison graphviz curl
+          python -m pip install --upgrade PyYAML


this rework means we're no longer testing against the latest released meson but against whatever our ubuntu version ships. That's generally not ideal - any specific reason why you reshuffled this? I don't see the old failing logs so it's unclear

Fixed.

Testing locally with podman, it uses root, which cannot use pip to update system dependencies. How I reproduce the exact same config as the CI locally?

hmm, good question, I don't actually know how to pull the same containers (VMs?) github uses. if you just need an extra user you can create that inside podman and then su to it.

whot · 2023-06-23T03:36:20Z

I initially tried to use xvfb-run, but it turns out to be problematic with valgrind: some memory issues with dash.

can you install bash and run in that somehow? You can also add a valgrind suppressions file like the one libinput has - that one has a few bash-specifics in it because we really don't care about those.

I use a hack to override the system version. Not pretty, but it works. Do you have a better idea?

tbh, building against whatever the latest version of xkeyboard-config is seems like a good idea anyway, the two projects are quite intertwined so we want things to blow up early.

wismill · 2023-06-23T09:05:49Z

can you install bash and run in that somehow? You can also add a valgrind suppressions file like the one libinput has - that one has a few bash-specifics in it because we really don't care about those.

@whot I already tried bash and it has similar issues. I think it is better to to avoid xvfb-run entirely, as these suppressions files may also require maintenance.

The macOS CI is failing. Is sh: dot: command not found the only reason? It looks totally unrelated to this MR.

wismill · 2023-06-23T09:33:03Z

Let’s investigate the macOS issue in #346. Then I will rebase.

Fix the issue that caused it to fail early.

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 · 2023-06-26T08:11:08Z

@whot Rebased. As I wrote hereinabove, I think it is better to avoid xvfb-run entirely, as valgrind suppressions files may also require maintenance. X11 being in maintenance-only mode, I believe the x11comp test should not require much maintenance, thus let’s not over optimize it!

I realize that the x11 test is actually skipped in the CI! We should probably use Xvfb there too.

whot

better run + skip than not run at all! :)

whot · 2023-06-27T04:22:03Z

as valgrind suppressions files may also require maintenance.

Luckily very little but yes, they do. I think in libinput it averaged to one or two per year but none since 2020 so it's not the worst of all things (and libinput builds against a lot of distros/versions).

wismill · 2023-06-27T14:41:21Z

Closing in favour of #348.

wismill force-pushed the wip/test/re-enable-x11comp branch 3 times, most recently from b549af9 to 4121efd Compare May 10, 2023 18:20

wismill added the testing Indicates a need for improvements or additions to testing label May 14, 2023

wismill force-pushed the wip/test/re-enable-x11comp branch 2 times, most recently from 632bec1 to bc6ad55 Compare June 19, 2023 18:33

wismill marked this pull request as ready for review June 19, 2023 18:37

wismill marked this pull request as draft June 19, 2023 18:38

wismill force-pushed the wip/test/re-enable-x11comp branch 15 times, most recently from 7fc2478 to a1ee3b3 Compare June 21, 2023 10:42

wismill marked this pull request as ready for review June 21, 2023 11:04

whot reviewed Jun 23, 2023

View reviewed changes

wismill force-pushed the wip/test/re-enable-x11comp branch 2 times, most recently from bc99771 to 2e92fcf Compare June 23, 2023 08:59

wismill force-pushed the wip/test/re-enable-x11comp branch from c3aa615 to 86fd60a Compare June 23, 2023 09:15

wismill added 2 commits June 26, 2023 09:54

Re-enable x11comp test

acef621

Fix the issue that caused it to fail early.

CI: use git master for xkeyboard-config on Linux

0c082d4

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/re-enable-x11comp branch from 86fd60a to 0c082d4 Compare June 26, 2023 07:56

wismill mentioned this pull request Jun 26, 2023

Test: Use a xvfb wrapper for x11 test #348

Merged

whot approved these changes Jun 27, 2023

View reviewed changes

wismill closed this Jun 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Re-enable x11comp test #339

Re-enable x11comp test #339

wismill commented May 10, 2023 •

edited

Loading

wismill commented May 10, 2023

wismill commented May 11, 2023

bluetech commented May 12, 2023

wismill commented May 13, 2023

bluetech commented May 13, 2023

wismill commented May 13, 2023

whot commented May 28, 2023

wismill commented Jun 21, 2023 •

edited

Loading

whot Jun 23, 2023

wismill Jun 23, 2023

whot Jun 27, 2023

whot commented Jun 23, 2023

wismill commented Jun 23, 2023 •

edited

Loading

wismill commented Jun 23, 2023

wismill commented Jun 26, 2023

whot left a comment

whot commented Jun 27, 2023

wismill commented Jun 27, 2023

Re-enable x11comp test #339

Re-enable x11comp test #339

Conversation

wismill commented May 10, 2023 • edited Loading

wismill commented May 10, 2023

wismill commented May 11, 2023

bluetech commented May 12, 2023

wismill commented May 13, 2023

bluetech commented May 13, 2023

wismill commented May 13, 2023

whot commented May 28, 2023

wismill commented Jun 21, 2023 • edited Loading

whot Jun 23, 2023

Choose a reason for hiding this comment

wismill Jun 23, 2023

Choose a reason for hiding this comment

whot Jun 27, 2023

Choose a reason for hiding this comment

whot commented Jun 23, 2023

wismill commented Jun 23, 2023 • edited Loading

wismill commented Jun 23, 2023

wismill commented Jun 26, 2023

whot left a comment

Choose a reason for hiding this comment

whot commented Jun 27, 2023

wismill commented Jun 27, 2023

wismill commented May 10, 2023 •

edited

Loading

wismill commented Jun 21, 2023 •

edited

Loading

wismill commented Jun 23, 2023 •

edited

Loading