@@ -170,17 +170,8 @@ test3()
return
fi
- cpu_subsys_path=$(get_cgroup_mountpoint "cpu")
-
- # Run the test for 30 secs
- if [ -z "$cpu_subsys_path" ]; then
- mount -t cgroup -o cpu xxx cgroup/
- if [ $? -ne 0 ]; then
- tst_res TFAIL "Failed to mount cpu subsys"
- return
- fi
- cpu_subsys_path=cgroup
- fi
+ cgroup_require "cpu"
+ cpu_subsys_path=$(cgroup_get_mountpoint "cpu")
cgroup_regression_3_1.sh $cpu_subsys_path &
pid1=$!
@@ -193,7 +184,7 @@ test3()
wait $pid2 2>/dev/null
rmdir $cpu_subsys_path/0 2> /dev/null
- tst_umount $PWD/cgroup
+ cgroup_cleanup
check_kernel_bug
}
@@ -310,7 +301,7 @@ test_7_1()
# could be passed here as params and this will lead to ambiguity and
# errors when grepping simply for 'debug' in /proc/mounts since we'll
# find also /sys/kernel/debug. Helper takes care of this.
- local subsys_path=$(get_cgroup_mountpoint $subsys)
+ local subsys_path=$(grep cgroup /proc/mounts | grep -w $subsys | awk '{ print $2 }')
if [ -z "$subsys_path" ]; then
mount -t cgroup -o $subsys xxx cgroup/
The older function in the cgroup lib 'get_cgroup_mountpoint' has been removed, so instead replace it with its old functionaility to get mountpoint. Also use the newer cgroup lib require operation to mount and cleanup a cpu controller. Signed-off-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger@canonical.com> --- .../cgroup/cgroup_regression_test.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)