shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

test: disable ProtectHome= when collecting coverage as well

Browse Source 
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:
Frantisek Sumsal 2021-10-23 21:20:37 +02:00
parent 096a154acc
commit 035af7adfe
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/test-functions
View File

@ -1117,11 +1117,11 @@ install_systemd() {
mkdir "$initdir/etc/systemd/system/user@.service.d/" 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" 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 # When built with gcov, disable ProtectSystem= and ProtectHome in the test
# it prevents gcov to write the coverage reports (*.gcda files) # images, since it prevents gcov to write the coverage reports (*.gcda files)
if get_bool "$IS_BUILT_WITH_COVERAGE"; then if get_bool "$IS_BUILT_WITH_COVERAGE"; then
mkdir -p "$initdir/etc/systemd/system/service.d/" 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 fi
} }

10
test/test-network/systemd-networkd-tests.py
View File

@ -307,7 +307,10 @@ def setUpModule():
if use_valgrind or asan_options or lsan_options or ubsan_options: if use_valgrind or asan_options or lsan_options or ubsan_options:
drop_in += ['MemoryDenyWriteExecute=no'] drop_in += ['MemoryDenyWriteExecute=no']
if with_coverage: 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) 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: 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: if use_valgrind or asan_options or lsan_options or ubsan_options:
drop_in += ['MemoryDenyWriteExecute=no'] drop_in += ['MemoryDenyWriteExecute=no']
if with_coverage: 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) 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: with open('/run/systemd/system/systemd-resolved.service.d/00-override.conf', mode='w') as f: