test: disable ProtectHome= when collecting coverage as well

Depending on the location of the original build dir, either ProtectHome=
or ProtectSystem= may get in the way when creating the gcov metadata
files.

Follow-up to:
    * 02d7e73013a92c5580023e4e548d19adbc254dbe
    * 6c9efba67715cd1ced170ac46c04d47934ad276a

diff --git a/test/test-functions b/test/test-functions
index 98b60d17f8ffc97b349f69c2b263084a86081fab..5dc773cbbc24b5ef0ce4cd22189c87c67b3d31ca 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -1117,11 +1117,11 @@ 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= 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)
     if get_bool "$IS_BUILT_WITH_COVERAGE"; then
         mkdir -p "$initdir/etc/systemd/system/service.d/"
-        echo -e "[Service]\nProtectSystem=no\n" >"$initdir/etc/systemd/system/service.d/override.conf"
+        echo -e "[Service]\nProtectSystem=no\nProtectHome=no\n" >"$initdir/etc/systemd/system/service.d/override.conf"
     fi
 }
 

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index aa81017072422ad7e52ebf912b193ea8f2eed23e..a5b26b102fdcbd1ee9424717c9066aaac58833c8 100755 (executable)
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -307,7 +307,10 @@ def setUpModule():
     if use_valgrind or asan_options or lsan_options or ubsan_options:
         drop_in += ['MemoryDenyWriteExecute=no']
     if with_coverage:
-        drop_in += ['ProtectSystem=no']
+        drop_in += [
+            'ProtectSystem=no',
+            'ProtectHome=no',
+        ]
 
     os.makedirs('/run/systemd/system/systemd-networkd.service.d', exist_ok=True)
     with open('/run/systemd/system/systemd-networkd.service.d/00-override.conf', mode='w') as f:
@@ -335,7 +338,10 @@ def setUpModule():
     if use_valgrind or asan_options or lsan_options or ubsan_options:
         drop_in += ['MemoryDenyWriteExecute=no']
     if with_coverage:
-        drop_in += ['ProtectSystem=no']
+        drop_in += [
+            'ProtectSystem=no',
+            'ProtectHome=no',
+        ]
 
     os.makedirs('/run/systemd/system/systemd-resolved.service.d', exist_ok=True)
     with open('/run/systemd/system/systemd-resolved.service.d/00-override.conf', mode='w') as f: