TODO: add note about chase_symlink flag

Merge pull request #21108 from mrc0mmand/here-comes-the-coverage
A couple more coverage-related tweaks
2026-04-01 04:34:51 +02:00 · 2021-10-24 17:00:49 +01:00 · 2021-10-24 22:54:23 +09:00 · 2021-10-23 22:10:24 +02:00 · 2021-10-23 21:46:53 +02:00 · 2021-10-23 21:27:20 +02:00
4 changed files with 15 additions and 6 deletions
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ System and Service Manager
 [![CIFuzz](https://github.com/systemd/systemd/workflows/CIFuzz/badge.svg)](https://github.com/systemd/systemd/actions)<br/>
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1369/badge)](https://bestpractices.coreinfrastructure.org/projects/1369)<br/>
 [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/systemd/systemd.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/systemd/systemd/context:cpp)<br/>
-[![CentOS CI - CentOS 7](https://jenkins-systemd.apps.ocp.ci.centos.org/buildStatus/icon?subject=CentOS%20CI%20-%20CentOS%207&job=upstream-centos7)](https://jenkins-systemd.apps.ocp.ci.centos.org/job/upstream-centos7/)<br/>
+[![CentOS CI - CentOS 8](https://jenkins-systemd.apps.ocp.ci.centos.org/buildStatus/icon?subject=CentOS%20CI%20-%20CentOS%208&job=upstream-centos8)](https://jenkins-systemd.apps.ocp.ci.centos.org/job/upstream-centos8/)<br/>
 [![CentOS CI - Arch](https://jenkins-systemd.apps.ocp.ci.centos.org/buildStatus/icon?subject=CentOS%20CI%20-%20Arch&job=upstream-vagrant-archlinux)](https://jenkins-systemd.apps.ocp.ci.centos.org/job/upstream-vagrant-archlinux/)<br/>
 [![CentOS CI - Arch (sanitizers)](https://jenkins-systemd.apps.ocp.ci.centos.org/buildStatus/icon?subject=CentOS%20CI%20-%20Arch%20(sanitizers)&job=upstream-vagrant-archlinux-sanitizers)](https://jenkins-systemd.apps.ocp.ci.centos.org/job/upstream-vagrant-archlinux-sanitizers/)<br/>
 [![Fossies codespell report](https://fossies.org/linux/test/systemd-main.tar.gz/codespell.svg)](https://fossies.org/linux/test/systemd-main.tar.gz/codespell.html)</br>
--- a/3
+++ b/3
@ -293,6 +293,9 @@ Features:
 * special case some calls of chase_symlinks() to use openat2() internally, so
  that the kernel does what we otherwise do.

+* add a new flag to chase_symlinks() that stops chasing once the first missing
+  component is found and then allows the caller to create the rest.
+
 * make use of new glibc 2.32 APIs sigabbrev_np() and strerrorname_np().

 * add /etc/integritytab, to support dm-integrity setups. In particular those
--- 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/gcov-override.conf"
    fi
 }

--- 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:
Author	SHA1	Message	Date
Luca Boccassi	6dbfbc4667	TODO: add note about chase_symlink flag	2021-10-24 17:00:49 +01:00
Yu Watanabe	8e4de611eb	Merge pull request #21108 from mrc0mmand/here-comes-the-coverage A couple more coverage-related tweaks	2021-10-24 22:54:23 +09:00
Frantisek Sumsal	d2a39812fd	test: rename the global service override file for coverage runs Otherwise we break TEST-15-DROPIN, since it uses /usr/lib/systemd/system/service.d/override.conf in some of its sub-tests.	2021-10-23 22:10:24 +02:00
Frantisek Sumsal	8d5b38e568	README: fix CentOS CI badge	2021-10-23 21:46:53 +02:00
Frantisek Sumsal	035af7adfe	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	2021-10-23 21:27:20 +02:00