selftests: add missing test name in memory-hotplug test

[mirror_ubuntu-zesty-kernel.git] / tools / testing / selftests / memory-hotplug / mem-on-off-test.sh

diff --git a/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh b/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh
index 6cddde0b96f85bc4e24fee9b679d2daf11c94b81..0f62c16c35c4d1924ee8beb76c580828d7fa7183 100755 (executable)
--- a/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh
+++ b/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh
@@ -22,6 +22,11 @@ prerequisite()
                echo $msg memory hotplug is not supported >&2
                exit 0
        fi
+
+       if ! grep -q 1 $SYSFS/devices/system/memory/memory*/removable; then
+               echo $msg no hot-pluggable memory >&2
+               exit 0
+       fi
 }
 
 #
@@ -39,7 +44,7 @@ hotpluggable_memory()
        done
 }
 
-hotplaggable_offline_memory()
+hotpluggable_offline_memory()
 {
        hotpluggable_memory offline
 }
@@ -131,6 +136,10 @@ while getopts e:hp:r: opt; do
                ;;
        r)
                ratio=$OPTARG
+               if [ "$ratio" -gt 100 ] || [ "$ratio" -lt 0 ]; then
+                       echo "The percentage should be an integer within 0~100 range"
+                       exit 1
+               fi
                ;;
        esac
 done
@@ -150,7 +159,7 @@ echo -e "\t online all hotplug memory in offline state"
 #
 # Online all hot-pluggable memory
 #
-for memory in `hotplaggable_offline_memory`; do
+for memory in `hotpluggable_offline_memory`; do
        echo offline-online $memory
        online_memory_expect_success $memory
 done
@@ -168,7 +177,7 @@ done
 #
 # Online all hot-pluggable memory again
 #
-for memory in `hotplaggable_offline_memory`; do
+for memory in `hotpluggable_offline_memory`; do
        echo offline-online $memory
        online_memory_expect_success $memory
 done
@@ -198,6 +207,7 @@ prerequisite_extra()
        fi
 }
 
+echo -e "\t Test with memory notifier error injection"
 prerequisite_extra
 
 #
@@ -214,7 +224,7 @@ done
 # Test memory hot-add error handling (offline => online)
 #
 echo $error > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_ONLINE/error
-for memory in `hotplaggable_offline_memory`; do
+for memory in `hotpluggable_offline_memory`; do
        online_memory_expect_fail $memory
 done
 
@@ -222,7 +232,7 @@ done
 # Online all hot-pluggable memory
 #
 echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_ONLINE/error
-for memory in `hotplaggable_offline_memory`; do
+for memory in `hotpluggable_offline_memory`; do
        online_memory_expect_success $memory
 done