mirror of
https://github.com/systemd/systemd
synced 2024-10-06 16:21:34 +00:00
Merge pull request #32562 from Werkov/test-cgroup-opensuse
Revert "TEST-19-CGROUP: Skip on opensuse"
This commit is contained in:
commit
a635b33214
|
@ -32,6 +32,7 @@ for attr in cgroup.threads memory.oom.group memory.reclaim ; do
|
|||
if grep -q "$attr" /sys/kernel/cgroup/delegate ; then
|
||||
systemd-run --wait \
|
||||
--unit=test-0.service \
|
||||
--property="MemoryAccounting=1" \
|
||||
--property="DynamicUser=1" \
|
||||
--property="Delegate=" \
|
||||
test -w /sys/fs/cgroup/system.slice/test-0.service/ -a \
|
||||
|
|
|
@ -3,14 +3,6 @@
|
|||
set -eux
|
||||
set -o pipefail
|
||||
|
||||
. /etc/os-release
|
||||
# FIXME: This test fails on opensuse with the following error and others:
|
||||
# Apr 25 10:24:04 H (cat)[910]: device-mapper: create ioctl on ... failed: Device or resource busy
|
||||
if [[ "$ID" =~ "opensuse" ]]; then
|
||||
echo "Skipping due to known unexpected behaviour in OpenSUSE kernels" >>/skipped
|
||||
exit 77
|
||||
fi
|
||||
|
||||
# shellcheck source=test/units/test-control.sh
|
||||
. "$(dirname "$0")"/test-control.sh
|
||||
|
||||
|
|
Loading…
Reference in a new issue