From: Kamalesh Babulal Date: Sun, 29 Sep 2024 09:18:03 +0000 (+0530) Subject: ftests/030: teach parsing v6.12 memory isolation X-Git-Tag: v3.2.0~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd664d52f8f3d6a09d5ec760e25de5a4e72cf62e;p=thirdparty%2Flibcgroup.git ftests/030: teach parsing v6.12 memory isolation Starting v6.12 memory code is split into v1 and v2 code, where v1 code is only compiled when CONFIG_MEMCG_V1 is set. Which defaults to disabled, teach the test case to ignore such failure. Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- diff --git a/tests/ftests/030-lssubsys-lssubsys_all.py b/tests/ftests/030-lssubsys-lssubsys_all.py index b24db21d..0a5e65f2 100755 --- a/tests/ftests/030-lssubsys-lssubsys_all.py +++ b/tests/ftests/030-lssubsys-lssubsys_all.py @@ -52,11 +52,13 @@ def test(config): found = True break - if not found and mount.controller == 'cpuset': + if not found and (mount.controller == 'cpuset' or + mount.controller == 'memory'): kernel_ver = utils.get_kernel_version(config) if int(kernel_ver[0]) >= 6 and int(kernel_ver[1]) >= 12: - # Starting 6.12 cpuset is split into v1 and v2, where - # v1 is compiled only when CONFIG_CPUSET_V1 is enabled + # Starting 6.12 cpuset and memory split into v1 and v2, + # where v1 is compiled only when CONFIG_CPUSET_V1 and + # CONFIG_MEMCG_v1 is enabled respectively. found = True if not found: