From 28edbbdc1ba7580a4b16e3c3d50f496e7cad7585 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 5 Sep 2025 10:03:32 +0100 Subject: [PATCH] test: add more debug output 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/units/TEST-50-DISSECT.dissect.sh b/test/units/TEST-50-DISSECT.dissect.sh index b38228792b..d1554870dc 100755 --- a/test/units/TEST-50-DISSECT.dissect.sh +++ b/test/units/TEST-50-DISSECT.dissect.sh @@ -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