From: Lai Jiangshan laijs@linux.alibaba.com
In my box, all CPUs are allowed to be offline. The test tries to offline all offline-able CPUs and causes fail on the last one. We should just skip offlining the last CPU
Signed-off-by: Lai Jiangshan laijs@linux.alibaba.com --- tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh index 0d26b5e3f966..5cdef96326a7 100755 --- a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh +++ b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh @@ -126,6 +126,11 @@ offline_cpu_expect_success() { local cpu=$1
+ # don't offline the last CPU if all CPUs are offline-able + if [[ a$cpu = a`cat $SYSFS/devices/system/cpu/online` ]]; then + return + fi + if ! offline_cpu $cpu; then echo $FUNCNAME $cpu: unexpected fail >&2 exit 1
From: Lai Jiangshan laijs@linux.alibaba.com
"," is allowed in cpu list strings, such as "0-3,5". We need to handle these cases.
Signed-off-by: Lai Jiangshan laijs@linux.alibaba.com --- tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh index 5cdef96326a7..ac37bd54ea1c 100755 --- a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh +++ b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh @@ -30,7 +30,7 @@ prerequisite()
echo "CPU online/offline summary:" online_cpus=`cat $SYSFS/devices/system/cpu/online` - online_max=${online_cpus##*-} + online_max=${online_cpus##*[-|,]}
if [[ "$online_cpus" = "$online_max" ]]; then echo "$msg: since there is only one cpu: $online_cpus" @@ -38,7 +38,7 @@ prerequisite() fi
present_cpus=`cat $SYSFS/devices/system/cpu/present` - present_max=${present_cpus##*-} + present_max=${present_cpus##*[-|,]} echo "present_cpus = $present_cpus present_max = $present_max"
echo -e "\t Cpus in online state: $online_cpus" @@ -47,7 +47,7 @@ prerequisite() if [[ "a$offline_cpus" = "a" ]]; then offline_cpus=0 else - offline_max=${offline_cpus##*-} + offline_max=${offline_cpus##*[-|,]} fi echo -e "\t Cpus in offline state: $offline_cpus" }
linux-kselftest-mirror@lists.linaro.org
-
Lai Jiangshan