mirror of
https://github.com/systemd/systemd
synced 2024-09-06 00:41:36 +00:00
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: *02d7e73013
*6c9efba677
This commit is contained in:
parent
096a154acc
commit
035af7adfe
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue