diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-06-23 14:06:19 +1000 |
|---|---|---|
| committer | Sergey Udaltsov <sergey.udaltsov@gmail.com> | 2020-06-23 09:05:58 +0000 |
| commit | d65a49e17ba729261901153035d190644d98c92b (patch) | |
| tree | 7230700dac84cdeca84cb85b448f02da187113c3 /.gitlab-ci.yml | |
| parent | 57719690b6ff45c5f2e5a8e41a770a43c7675ca4 (diff) | |
| download | xkeyboard-config-d65a49e17ba729261901153035d190644d98c92b.tar.gz | |
gitlab CI: run the xkeyboard-config rules test tool against evdev.extras.xml
libxkbcommon's parser has an optimization where it stops parsing a file when
the required keymap is found. The result of that was that the syntax error
fixed in !83 didn't get detected - all tested layouts where before that
erroneous line.
There's only one xkb_symbols map thats below that line but that one is
referenced in evdev.extras.xml, not evdev.xml. So let's update our CI to test
for that too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfe64e7..08e13c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,7 +145,8 @@ layout_tests: - meson builddir -Denable-wayland=false -Denable-x11=false -Denable-docs=false -Dxkb-config-root="$INSTDIR/share/X11/xkb" - ninja -C builddir - echo Running test script - this will take several minutes - - ./builddir/xkeyboard-config-test > $INSTDIR/xkeyboard-config-test.out + - ./builddir/xkeyboard-config-test "$INSTDIR/share/X11/xkb/rules/evdev.xml" > $INSTDIR/xkeyboard-config-test.out + - ./builddir/xkeyboard-config-test "$INSTDIR/share/X11/xkb/rules/evdev.extras.xml" >> $INSTDIR/xkeyboard-config-test.out - popd > /dev/null variables: GIT_STRATEGY: none |