diff options
| author | Simon McVittie <smcv@debian.org> | 2022-07-14 18:16:50 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2022-07-14 18:36:23 +0100 |
| commit | 25ee24000eaf5c0873a74d44d9dd6e80881122ff (patch) | |
| tree | a96f3ad95238ae0b89f65696c693674ca6dd81ec /.gitlab-ci.yml | |
| parent | 947f40f511efd8d36e78c1a76c57daa8f6886de0 (diff) | |
| download | cairo-25ee24000eaf5c0873a74d44d9dd6e80881122ff.tar.gz | |
CI: Invoke test scripts via `meson test` where possible
Using `meson test` is the Meson equivalent of `make check`, and is the
way developers of other Meson-built projects will generally expect to
run tests. In particular, it encapsulates which of the tests want to be
run from which directories, removing the need for the Gitlab-CI
integration to know this.
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fa840856..ba63c8fc0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -212,16 +212,16 @@ fedora meson build: - export CFLAGS="-Werror -Wno-error=deprecated-declarations" - meson builddir ${MESON_ARGS} - ninja -C builddir - # - ninja -C builddir test # Run test scripts #- (cd builddir/src && srcdir=../../src bash "$srcdir/check-def.sh") This script calls "make cairo.def" and thus does not work with meson - mkdir builddir/src/.libs - touch builddir/src/.libs/libfoo.so - - MAKE=echo CAIRO_HAS_HIDDEN_SYMBOLS=1 bash src/check-plt.sh builddir/src/libcairo.so - - (cd src && bash "check-headers.sh") - - (cd src && bash "check-preprocessor-syntax.sh") - - (cd src && bash "check-doc-syntax.sh") + # Run all the tests, except for the big test executable which + # gets run separately + - meson test -C builddir --no-suite=slow + + # TODO: These aren't set up as Meson tests yet - (cd doc/public && bash "check-doc-syntax.sh") # FIXME: The following line really needs gtk-doc to run first - (cd doc/public && DOC_MODULE=cairo bash "check-doc-coverage.sh") |