aboutsummaryrefslogtreecommitdiff
path: root/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh
diff options
context:
space:
mode:
Diffstat (limited to 'testcases/kernel/controllers/cpuset/cpuset_regression_test.sh')
-rwxr-xr-xtestcases/kernel/controllers/cpuset/cpuset_regression_test.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh b/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh
index 8e87d20e4..a5757309f 100755
--- a/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh
+++ b/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh
@@ -12,7 +12,7 @@
TST_SETUP=setup
TST_CLEANUP=cleanup
-TST_TESTFUNC=test
+TST_TESTFUNC=do_test
TST_NEEDS_ROOT=1
TST_NEEDS_TMPDIR=1
TST_MIN_KVER="3.18"
@@ -130,6 +130,11 @@ setup()
tst_res TINFO "test starts with cgroup version $cgroup_version"
+ if [ "$cgroup_version" = "2" ]; then
+ tst_brk TCONF "cgroup v2 found, skipping test"
+ return
+ fi
+
if ! [ -f ${root_cpuset_dir}/${cpu_exclusive} ]; then
cpu_exclusive=cpu_exclusive
cpus=cpus
@@ -178,7 +183,7 @@ cleanup()
cgroup_cleanup
}
-test()
+do_test()
{
local cpu_exclusive_tmp cpus_value