CI: run pytest as separate job

Because we currently only run the test suite in valgrind, we skip the
python test suite there (we don't want to valgrind python itself, too
messy).

Fix this by specifically excluding the python test suite and having a
separate job that just runs that suite instead.

And because the protocol test suite needs the directory to the
eis-demo-server and isn't smart enough to split spaces correctly, let's
change the builddir to just that.
This commit is contained in:
Peter Hutterer 2023-02-15 16:43:00 +10:00
parent 3fa396c012
commit 312ce6723b
2 changed files with 16 additions and 2 deletions

View file

@ -43,7 +43,7 @@ variables:
FDO_UPSTREAM_REPO: libinput/libei
MESON_BUILDDIR: "build dir"
MESON_BUILDDIR: "builddir"
NINJA_ARGS: ''
MESON_ARGS: ''
MESON_TEST_ARGS: ''
@ -201,6 +201,7 @@ fedora:37@container-prep:
- .fdo.distribution-image@fedora
- .build@template
variables:
MESON_TEST_ARGS: '--no-suite=python'
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
@ -236,6 +237,12 @@ valgrind@fedora:37:
before_script:
- dnf install -y valgrind
pytest@fedora:37:
extends:
- .fedora-build@template
variables:
MESON_TEST_ARGS: '--suite=python'
werror@fedora:37:
extends:
- .fedora-build@template

View file

@ -53,7 +53,7 @@ variables:
FDO_UPSTREAM_REPO: libinput/libei
MESON_BUILDDIR: "build dir"
MESON_BUILDDIR: "builddir"
NINJA_ARGS: ''
MESON_ARGS: ''
MESON_TEST_ARGS: ''
@ -217,6 +217,7 @@ python-ruff:
- .fdo.distribution-image@fedora
- .build@template
variables:
MESON_TEST_ARGS: '--no-suite=python'
FDO_DISTRIBUTION_VERSION: '{{version}}'
FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG
needs:
@ -252,6 +253,12 @@ valgrind@{{distro.name}}:{{version}}:
before_script:
- dnf install -y valgrind
pytest@{{distro.name}}:{{version}}:
extends:
- .{{distro.name}}-build@template
variables:
MESON_TEST_ARGS: '--suite=python'
werror@{{distro.name}}:{{version}}:
extends:
- .{{distro.name}}-build@template