From: Daan De Meyer Date: Thu, 11 Dec 2025 16:21:08 +0000 (+0100) Subject: tree-wide: Use meson test -q X-Git-Tag: v259~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9848f56cc68a5f193d515f080b7b01e6a689ae22;p=thirdparty%2Fsystemd.git tree-wide: Use meson test -q meson test output is extremely verbose, printing a separate line for each successful test. Let's add -q/--quiet everywhere so it only prints full lines for skipped and failed tests. --- diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 3e1ffffb746..d3c9c12127f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -124,7 +124,8 @@ jobs: --no-stdsplit \ --num-processes "$(($(nproc) - 1))" \ --timeout-multiplier 2 \ - --max-lines 300 + --max-lines 300 \ + --quiet - name: Archive failed test journals uses: actions/upload-artifact@v4 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 1a0bc391720..fda63e5bf3b 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -80,7 +80,7 @@ jobs: run: mkosi box -- env CC=clang CXX=clang++ meson setup -Dlocalegen-path=/usr/bin/locale-gen -Dcompat-mutable-uid-boundaries=true build - name: Run clang-tidy - run: mkosi box -- meson test -C build --suite=clang-tidy --print-errorlogs --no-stdsplit + run: mkosi box -- meson test -C build --suite=clang-tidy --print-errorlogs --no-stdsplit --quiet - name: Build with musl run: mkosi box -- .github/workflows/build-test-musl.sh diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 5a5ea8d4f76..da9e730d470 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -308,6 +308,7 @@ jobs: --print-errorlogs \ --no-stdsplit \ --num-processes "$(($(nproc) - 1))" \ + --quiet \ "${MAX_LINES[@]}" - name: Archive failed test journals diff --git a/.github/workflows/unit-tests-musl.sh b/.github/workflows/unit-tests-musl.sh index ab7cdf0a702..5a9e68710a2 100755 --- a/.github/workflows/unit-tests-musl.sh +++ b/.github/workflows/unit-tests-musl.sh @@ -47,7 +47,7 @@ for phase in "${PHASES[@]}"; do # correctly detect the environment. env \ SYSTEMD_IN_CHROOT=yes \ - meson test -C build --print-errorlogs --no-stdsplit + meson test -C build --print-errorlogs --no-stdsplit --quiet ;; CLEANUP) info "Cleanup phase" diff --git a/.github/workflows/unit-tests.sh b/.github/workflows/unit-tests.sh index c119a86011a..c87b7d2e9a3 100755 --- a/.github/workflows/unit-tests.sh +++ b/.github/workflows/unit-tests.sh @@ -109,7 +109,7 @@ for phase in "${PHASES[@]}"; do run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build ninja -C build -v # Ensure setting a timezone (like the reproducible build tests do) does not break time/date unit tests - TZ=GMT+12 meson test "${MESON_TEST_ARGS[@]}" -C build --print-errorlogs --no-stdsplit + TZ=GMT+12 meson test "${MESON_TEST_ARGS[@]}" -C build --print-errorlogs --no-stdsplit --quiet ;; RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN_NO_DEPS) # TODO: drop after we switch to ubuntu 26.04 @@ -151,7 +151,7 @@ for phase in "${PHASES[@]}"; do # during debugging, wonderful), so let's at least keep a workaround # here to make the builds stable for the time being. (set +x; while :; do echo -ne "\n[WATCHDOG] $(date)\n"; sleep 30; done) & - meson test --timeout-multiplier=3 -C build --print-errorlogs --no-stdsplit + meson test --timeout-multiplier=3 -C build --print-errorlogs --no-stdsplit --quiet ;; CLEANUP) info "Cleanup phase" diff --git a/README b/README index e8136743438..84f2b3ae41f 100644 --- a/README +++ b/README @@ -290,7 +290,7 @@ REQUIREMENTS: Useful commands: ninja -C build -v some/target - meson test -C build/ + meson test -C build/ -q sudo meson install -C build/ --no-rebuild DESTDIR=... meson install -C build/ diff --git a/docs/HACKING.md b/docs/HACKING.md index 2825a4e3f09..aa226445e7b 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -43,7 +43,7 @@ $ mkosi -f genkey # Generate signing $ mkosi -f box -- meson setup -Dbpf-framework=disabled build # bpftool detection inside mkosi box is broken on Ubuntu Noble and older $ mkosi -f box -- meson compile -C build $ mkosi -f box -- build/systemctl --version -$ mkosi -f box -- meson test -C build --print-errorlogs # Run the unit tests +$ mkosi -f box -- meson test -C build --print-errorlogs -q # Run the unit tests ``` To build and boot an OS image with the latest systemd installed: