diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2aaed0cf..3a099c94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -201,7 +201,7 @@ debian meson clang debug: - 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 - meson compile -C test/use-as-subproject/_build - - meson test -C test/use-as-subproject/_build + - "meson test -C test/use-as-subproject/_build dbus:" debian meson reduced: extends: @@ -387,7 +387,7 @@ windows-meson-mingw-ucrt64: - C:\msys64\usr\bin\bash -lc " meson build && ninja -j1 -C build && - meson test --no-suite=runs-dbus-daemon -C build" + meson test --no-suite=runs-dbus-daemon -C build dbus:" artifacts: reports: junit: "build/meson-logs/testlog.junit.xml" @@ -406,7 +406,7 @@ windows-meson-vs15-x86: - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=x86 && meson --force-fallback-for=expat,glib,zlib build && meson compile -C build && - meson test --no-suite=runs-dbus-daemon -C build" + meson test --no-suite=runs-dbus-daemon -C build dbus:" artifacts: reports: junit: "build/meson-logs/testlog.junit.xml" diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 40c1598b..b258c951 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -465,7 +465,7 @@ case "$ci_buildsys" in # This is too slow and verbose to keep enabled at the moment export DBUS_TEST_MALLOC_FAILURES=0 - [ "$ci_test" = no ] || meson test --print-errorlogs + [ "$ci_test" = no ] || meson test dbus: --print-errorlogs DESTDIR=DESTDIR meson install ( cd DESTDIR && find . -ls)