richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
aa0848
From 523e72e97d7c945114b54b726eaab0d379fb35fb Mon Sep 17 00:00:00 2001
aa0848
From: Frantisek Sumsal <frantisek@sumsal.cz>
aa0848
Date: Tue, 1 Feb 2022 20:25:00 +0100
aa0848
Subject: [PATCH] test: require unified cgroup hierarchy for TEST-56
aa0848
aa0848
since cgroup empty notifications are unreliable in legacy cgroups.
aa0848
aa0848
See: systemd/systemd#22320
aa0848
Complements: systemd/systemd#22344
aa0848
(cherry picked from commit e2620820188428de7086f5e8ac41305177f70954)
aa0848
aa0848
Related: #2047768
aa0848
---
aa0848
 test/TEST-56-EXIT-TYPE/test.sh | 5 +++++
aa0848
 1 file changed, 5 insertions(+)
aa0848
aa0848
diff --git a/test/TEST-56-EXIT-TYPE/test.sh b/test/TEST-56-EXIT-TYPE/test.sh
aa0848
index 0f84dca1ba..37475e817e 100755
aa0848
--- a/test/TEST-56-EXIT-TYPE/test.sh
aa0848
+++ b/test/TEST-56-EXIT-TYPE/test.sh
aa0848
@@ -6,4 +6,9 @@ TEST_DESCRIPTION="test ExitType=cgroup"
aa0848
 # shellcheck source=test/test-functions
aa0848
 . "${TEST_BASE_DIR:?}/test-functions"
aa0848
 
aa0848
+if [[ "$(get_cgroup_hierarchy)" != unified ]]; then
aa0848
+    echo "This test requires unified cgroup hierarchy, skipping..."
aa0848
+    exit 0
aa0848
+fi
aa0848
+
aa0848
 do_test "$@"