diff options
| author | Simon McVittie <smcv@collabora.com> | 2023-12-01 19:03:49 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2023-12-01 19:03:49 +0000 |
| commit | accbd6d041ae5eabcc91ff828a1c6321a6ae0811 (patch) | |
| tree | 2ab0826d2fc11639bf9a7f83dacd539e95f243ca | |
| parent | ed87c10fdc5e0ecc7f2a5cdab689aaa75bda9a1d (diff) | |
CI: Don't re-run the tests when preparing to build as a subproject
After running the test suite, we don't need (or want) to re-run the test
suite as a side-effect of producing a dist tarball. Historically, this
test-case used Autotools `make dist`, not `make distcheck`, but when
we removed the Autotools build system, it was replaced with
`meson dist` (similar to Autotools `make distcheck`). Change that to
`meson dist --no-tests`, which is more like Autotools `make dist` as
originally intended.
In particular, when we re-ran the test suite, we weren't filtering out
the time-consuming and timeout-prone tests that emulate malloc()
failures, which we don't normally intend to run in CI.
Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/489
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f0ab731..c496b3d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -194,7 +194,7 @@ debian meson clang debug: - ./tools/ci-build.sh # Also test that we can be used as a subproject: # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/388 - - meson dist -C $ci_builddir --formats xztar + - meson dist -C $ci_builddir --formats xztar --no-tests - mkdir -p test/use-as-subproject/subprojects/dbus - tar --strip-components=1 -C test/use-as-subproject/subprojects/dbus -xf $ci_builddir/meson-dist/*.tar.xz - meson setup --wrap-mode=forcefallback test/use-as-subproject/_build test/use-as-subproject |