]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
CI: Don't re-run the tests when preparing to build as a subproject
authorSimon McVittie <smcv@collabora.com>
Fri, 1 Dec 2023 19:03:49 +0000 (19:03 +0000)
committerSimon McVittie <smcv@collabora.com>
Fri, 1 Dec 2023 19:03:49 +0000 (19:03 +0000)
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>
.gitlab-ci.yml

index 9f0ab731947dbfedd50b17e6718ba9254ab81267..c496b3d48fafcb106d0818f730c05a23969f42b4 100644 (file)
@@ -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