Commit 972cf4ce authored by Zhao Gongyi's avatar Zhao Gongyi Committed by Shuah Khan
Browse files

selftests/cpu-hotplug: Use return instead of exit 



Some cpus will be left in offline state when online
function exits in some error conditions. Use return
instead of exit to fix it.

Signed-off-by: default avatarZhao Gongyi <zhaogongyi@huawei.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 2354edd0

tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh

+8 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
SYSFS=

# Kselftest framework requirement - SKIP code is 4.

ksft_skip=4

retval=0



prerequisite()

{
@@ -102,10 +103,10 @@ online_cpu_expect_success() 


	if ! online_cpu $cpu; then

		echo $FUNCNAME $cpu: unexpected fail >&2

		exit 1

		retval=1

	elif ! cpu_is_online $cpu; then

		echo $FUNCNAME $cpu: unexpected offline >&2

		exit 1

		retval=1

	fi

}
@@ -128,10 +129,10 @@ offline_cpu_expect_success() 


	if ! offline_cpu $cpu; then

		echo $FUNCNAME $cpu: unexpected fail >&2

		exit 1

		retval=1

	elif ! cpu_is_offline $cpu; then

		echo $FUNCNAME $cpu: unexpected offline >&2

		exit 1

		retval=1

	fi

}
@@ -201,7 +202,7 @@ if [ $allcpus -eq 0 ]; then 
		offline_cpu_expect_success $present_max

		online_cpu $present_max

	fi

	exit 0

	exit $retval

else

	echo "Full scope test: all hotplug cpus"

	echo -e "\t online all offline cpus"
@@ -291,3 +292,5 @@ done 


echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/CPU_DOWN_PREPARE/error

/sbin/modprobe -q -r cpu-notifier-error-inject



exit $retval