In shell, function's return value can not exceed 255, if we run
the test on machines which have more than 255 cpus, the result
will be incorrect, so fix this.
Signed-off-by: Guangwen Feng <fenggw-f...@cn.fujitsu.com>
---
testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug01.sh | 3 +--
testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug02.sh | 3 +--
testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug03.sh | 3 +--
testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug04.sh | 6 ++----
testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug05.sh | 3 +--
testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug06.sh | 3 +--
testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug07.sh | 3 +--
testcases/kernel/hotplug/cpu_hotplug/include/cpuhotplug_hotplug.sh | 4 ++--
8 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug01.sh
b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug01.sh
index 8ae1379..97d6f0a 100755
--- a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug01.sh
+++ b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug01.sh
@@ -111,8 +111,7 @@ LOOP_COUNT=1
tst_check_cmds perl
-get_present_cpus_num
-if [ $? -lt 2 ]; then
+if [ $(get_present_cpus_num) -lt 2 ]; then
tst_brkm TCONF "system doesn't have required CPU hotplug support"
fi
diff --git a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug02.sh
b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug02.sh
index c42cc1b..792f8cd 100755
--- a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug02.sh
+++ b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug02.sh
@@ -54,8 +54,7 @@ done
LOOP_COUNT=1
-get_present_cpus_num
-if [ $? -lt 2 ]; then
+if [ $(get_present_cpus_num) -lt 2 ]; then
tst_brkm TCONF "system doesn't have required CPU hotplug support"
fi
diff --git a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug03.sh
b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug03.sh
index 3469b10..14ccf85 100755
--- a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug03.sh
+++ b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug03.sh
@@ -63,8 +63,7 @@ done
LOOP_COUNT=1
-get_present_cpus_num
-cpus_num=$?
+cpus_num=$(get_present_cpus_num)
if [ $cpus_num -lt 2 ]; then
tst_brkm TCONF "system doesn't have required CPU hotplug support"
fi
diff --git a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug04.sh
b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug04.sh
index 58a822e..fa4e247 100755
--- a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug04.sh
+++ b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug04.sh
@@ -48,14 +48,12 @@ done
LOOP_COUNT=1
-get_present_cpus_num
-cpus_num=$?
+cpus_num=$(get_present_cpus_num)
if [ $cpus_num -lt 2 ]; then
tst_brkm TCONF "system doesn't have required CPU hotplug support"
fi
-get_hotplug_cpus_num
-if [ $? -lt 1 ]; then
+if [ $(get_hotplug_cpus_num) -lt 1 ]; then
tst_brkm TCONF "system doesn't have at least one hotpluggable CPU"
fi
diff --git a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug05.sh
b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug05.sh
index 60382c8..4be2123 100755
--- a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug05.sh
+++ b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug05.sh
@@ -55,8 +55,7 @@ LOOP_COUNT=1
tst_check_cmds sar
-get_present_cpus_num
-if [ $? -lt 2 ]; then
+if [ $(get_present_cpus_num) -lt 2 ]; then
tst_brkm TCONF "system doesn't have required CPU hotplug support"
fi
diff --git a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug06.sh
b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug06.sh
index 6710fad..18a1119 100755
--- a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug06.sh
+++ b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug06.sh
@@ -49,8 +49,7 @@ done
LOOP_COUNT=1
-get_present_cpus_num
-if [ $? -lt 2 ]; then
+if [ $(get_present_cpus_num) -lt 2 ]; then
tst_brkm TCONF "system doesn't have required CPU hotplug support"
fi
diff --git a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug07.sh
b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug07.sh
index 7edb3a9..2783046 100755
--- a/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug07.sh
+++ b/testcases/kernel/hotplug/cpu_hotplug/functional/cpuhotplug07.sh
@@ -55,8 +55,7 @@ done
LOOP_COUNT=1
-get_present_cpus_num
-if [ $? -lt 2 ]; then
+if [ $(get_present_cpus_num) -lt 2 ]; then
tst_brkm TCONF "system doesn't have required CPU hotplug support"
fi
diff --git a/testcases/kernel/hotplug/cpu_hotplug/include/cpuhotplug_hotplug.sh
b/testcases/kernel/hotplug/cpu_hotplug/include/cpuhotplug_hotplug.sh
index 6920393..48bd814 100644
--- a/testcases/kernel/hotplug/cpu_hotplug/include/cpuhotplug_hotplug.sh
+++ b/testcases/kernel/hotplug/cpu_hotplug/include/cpuhotplug_hotplug.sh
@@ -169,7 +169,7 @@ get_present_cpus()
#
get_present_cpus_num()
{
- return $(get_present_cpus | wc -w)
+ echo $(get_present_cpus | wc -w)
}
# get_hotplug_cpus()
@@ -196,7 +196,7 @@ get_hotplug_cpus()
#
get_hotplug_cpus_num()
{
- return $(get_hotplug_cpus | wc -w)
+ echo $(get_hotplug_cpus | wc -w)
}
# get_all_cpu_states()
--
1.8.4.2
------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
