]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: add more debug output
authorLuca Boccassi <luca.boccassi@gmail.com>
Fri, 5 Sep 2025 09:03:32 +0000 (10:03 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 5 Sep 2025 10:13:25 +0000 (12:13 +0200)
The test occasionally fails with:

TEST-50-DISSECT.sh[3852]: Hierarchy '/usr' is already merged.

I can't really tell what is already merged as all previous ops
look as they are undone from the logs, so add status/list commands
just before the failing operation to hopefully give more info

For https://github.com/systemd/systemd/issues/38282

test/units/TEST-50-DISSECT.dissect.sh

index b38228792b6f9a5cb91fd3bbc4170775fe29dfc6..d1554870dc656b9f64b03cb71980cde67efbd96e 100755 (executable)
@@ -771,6 +771,8 @@ rm -rf "$VDIR" "$VDIR2" /tmp/vpickminimg /tmp/markers/
 # Test that an extension consisting of an empty directory under /etc/extensions/ takes precedence
 mkdir -p /var/lib/extensions/
 ln -s /tmp/app-nodistro.raw /var/lib/extensions/app-nodistro.raw
+systemd-sysext status
+systemd-sysext list
 systemd-sysext merge
 grep -q -F "MARKER=1" /usr/lib/systemd/system/some_file
 systemd-sysext unmerge