From b6fc52408afa91f2fb7650e6a7d42c65396e7815 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 14 Feb 2022 20:19:51 +0100 Subject: [PATCH] test: set `ReadWritePaths=$BUILD_DIR` when running w/ coverage otherwise units using `DynamicUser=yes` won't be able to write the coverage stats (currently affecting TEST-20-MAINPIDGAMES). `DynamicUser=yes` implies `ProtectSystem=strict` and `ProtectHome=read-only` and can't be overridden hence we need to utilize `ReadWritePaths=` to work around that. --- test/test-functions | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/test-functions b/test/test-functions index 2c13baab048..dbd6371622a 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1163,11 +1163,13 @@ install_systemd() { mkdir "$initdir/etc/systemd/system/user@.service.d/" echo -e "[Service]\nPassEnvironment=SYSTEMD_UNIT_PATH\n" >"$initdir/etc/systemd/system/user@.service.d/override.conf" - # When built with gcov, disable ProtectSystem= and ProtectHome in the test - # images, since it prevents gcov to write the coverage reports (*.gcda files) + # When built with gcov, disable ProtectSystem= and ProtectHome= in the test + # images, since it prevents gcov to write the coverage reports (*.gcda + # files). Similarly, set ReadWritePaths= to the $BUIL_DIR in the test image + # to make the coverage work with units utilizing DynamicUser=yes. if get_bool "$IS_BUILT_WITH_COVERAGE"; then mkdir -p "$initdir/etc/systemd/system/service.d/" - echo -e "[Service]\nProtectSystem=no\nProtectHome=no\n" >"$initdir/etc/systemd/system/service.d/gcov-override.conf" + echo -e "[Service]\nProtectSystem=no\nProtectHome=no\nReadWritePaths=${BUILD_DIR:?}\n" >"$initdir/etc/systemd/system/service.d/gcov-override.conf" fi # If we're built with -Dportabled=false, tests with systemd-analyze -- 2.47.3