| Message ID | 20181225104148.19283-2-po-hsu.lin@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [X,SRU,1/1] selftests/cpu-hotplug: exit with failure when test occured unexpected behaviors | expand |
On 12/25/18 11:41 AM, Po-Hsu Lin wrote: > From: Li Zhijian <lizhijian@cn.fujitsu.com> > > BugLink: https://bugs.launchpad.net/bugs/1809699 > > Previously, 'make run_tests -C cpu-hotplug' always PASS since cpu-on-off-test.sh > always exits 0 even though the test got some unexpected errors like below: > root@debian9:/home/lizhijian/chroot/linux/tools/testing/selftests/cpu-hotplug# make run_tests > pid 878's current affinity mask: 1 > pid 878's new affinity mask: 1 > CPU online/offline summary: > Cpus in online state: 0 > Cpus in offline state: 0 > Limited scope test: one hotplug cpu > (leaves cpu in the original state): > online to offline to online: cpu 0 > ./cpu-on-off-test.sh: line 83: /sys/devices/system/cpu/cpu0/online: Permission denied > offline_cpu_expect_success 0: unexpected fail > ./cpu-on-off-test.sh: line 78: /sys/devices/system/cpu/cpu0/online: Permission denied > online_cpu_expect_success 0: unexpected fail > selftests: cpu-on-off-test.sh [PASS] > > after this patch, the test will exit with failure once it occurs some unexpected behaviors > > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> > (cherry picked from commit 8fe6e53a8ed5f043ff4e6a366ebb3a641114546b) > Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Clean cherry-pick, limited to selftests. Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh | 8 ++++++++ > 1 file changed, 8 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 98b1d65..e5666dd 100755 > --- a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh > +++ b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh > @@ -89,8 +89,10 @@ online_cpu_expect_success() > > if ! online_cpu $cpu; then > echo $FUNCNAME $cpu: unexpected fail >&2 > + exit 1 > elif ! cpu_is_online $cpu; then > echo $FUNCNAME $cpu: unexpected offline >&2 > + exit 1 > fi > } > > @@ -100,8 +102,10 @@ online_cpu_expect_fail() > > if online_cpu $cpu 2> /dev/null; then > echo $FUNCNAME $cpu: unexpected success >&2 > + exit 1 > elif ! cpu_is_offline $cpu; then > echo $FUNCNAME $cpu: unexpected online >&2 > + exit 1 > fi > } > > @@ -111,8 +115,10 @@ offline_cpu_expect_success() > > if ! offline_cpu $cpu; then > echo $FUNCNAME $cpu: unexpected fail >&2 > + exit 1 > elif ! cpu_is_offline $cpu; then > echo $FUNCNAME $cpu: unexpected offline >&2 > + exit 1 > fi > } > > @@ -122,8 +128,10 @@ offline_cpu_expect_fail() > > if offline_cpu $cpu 2> /dev/null; then > echo $FUNCNAME $cpu: unexpected success >&2 > + exit 1 > elif ! cpu_is_online $cpu; then > echo $FUNCNAME $cpu: unexpected offline >&2 > + exit 1 > fi > } >
On 25.12.18 11:41, Po-Hsu Lin wrote: > From: Li Zhijian <lizhijian@cn.fujitsu.com> > > BugLink: https://bugs.launchpad.net/bugs/1809699 > > Previously, 'make run_tests -C cpu-hotplug' always PASS since cpu-on-off-test.sh > always exits 0 even though the test got some unexpected errors like below: > root@debian9:/home/lizhijian/chroot/linux/tools/testing/selftests/cpu-hotplug# make run_tests > pid 878's current affinity mask: 1 > pid 878's new affinity mask: 1 > CPU online/offline summary: > Cpus in online state: 0 > Cpus in offline state: 0 > Limited scope test: one hotplug cpu > (leaves cpu in the original state): > online to offline to online: cpu 0 > ./cpu-on-off-test.sh: line 83: /sys/devices/system/cpu/cpu0/online: Permission denied > offline_cpu_expect_success 0: unexpected fail > ./cpu-on-off-test.sh: line 78: /sys/devices/system/cpu/cpu0/online: Permission denied > online_cpu_expect_success 0: unexpected fail > selftests: cpu-on-off-test.sh [PASS] > > after this patch, the test will exit with failure once it occurs some unexpected behaviors > > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> > (cherry picked from commit 8fe6e53a8ed5f043ff4e6a366ebb3a641114546b) > Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh | 8 ++++++++ > 1 file changed, 8 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 98b1d65..e5666dd 100755 > --- a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh > +++ b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh > @@ -89,8 +89,10 @@ online_cpu_expect_success() > > if ! online_cpu $cpu; then > echo $FUNCNAME $cpu: unexpected fail >&2 > + exit 1 > elif ! cpu_is_online $cpu; then > echo $FUNCNAME $cpu: unexpected offline >&2 > + exit 1 > fi > } > > @@ -100,8 +102,10 @@ online_cpu_expect_fail() > > if online_cpu $cpu 2> /dev/null; then > echo $FUNCNAME $cpu: unexpected success >&2 > + exit 1 > elif ! cpu_is_offline $cpu; then > echo $FUNCNAME $cpu: unexpected online >&2 > + exit 1 > fi > } > > @@ -111,8 +115,10 @@ offline_cpu_expect_success() > > if ! offline_cpu $cpu; then > echo $FUNCNAME $cpu: unexpected fail >&2 > + exit 1 > elif ! cpu_is_offline $cpu; then > echo $FUNCNAME $cpu: unexpected offline >&2 > + exit 1 > fi > } > > @@ -122,8 +128,10 @@ offline_cpu_expect_fail() > > if offline_cpu $cpu 2> /dev/null; then > echo $FUNCNAME $cpu: unexpected success >&2 > + exit 1 > elif ! cpu_is_online $cpu; then > echo $FUNCNAME $cpu: unexpected offline >&2 > + exit 1 > fi > } > >
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 98b1d65..e5666dd 100755 --- a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh +++ b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh @@ -89,8 +89,10 @@ online_cpu_expect_success() if ! online_cpu $cpu; then echo $FUNCNAME $cpu: unexpected fail >&2 + exit 1 elif ! cpu_is_online $cpu; then echo $FUNCNAME $cpu: unexpected offline >&2 + exit 1 fi } @@ -100,8 +102,10 @@ online_cpu_expect_fail() if online_cpu $cpu 2> /dev/null; then echo $FUNCNAME $cpu: unexpected success >&2 + exit 1 elif ! cpu_is_offline $cpu; then echo $FUNCNAME $cpu: unexpected online >&2 + exit 1 fi } @@ -111,8 +115,10 @@ offline_cpu_expect_success() if ! offline_cpu $cpu; then echo $FUNCNAME $cpu: unexpected fail >&2 + exit 1 elif ! cpu_is_offline $cpu; then echo $FUNCNAME $cpu: unexpected offline >&2 + exit 1 fi } @@ -122,8 +128,10 @@ offline_cpu_expect_fail() if offline_cpu $cpu 2> /dev/null; then echo $FUNCNAME $cpu: unexpected success >&2 + exit 1 elif ! cpu_is_online $cpu; then echo $FUNCNAME $cpu: unexpected offline >&2 + exit 1 fi }