aboutsummaryrefslogtreecommitdiff
path: root/memory-hotplug
diff options
context:
space:
mode:
authorArthur She <arthur.she@linaro.org>2014-09-18 11:25:00 -0700
committerArthur She <arthur.she@linaro.org>2014-09-18 11:25:00 -0700
commit10d00136a81eacb6068ad6f153e6f6983b1355c9 (patch)
treeb2ac61c7572a4bbb49aa5c871fe6f3fd68436db1 /memory-hotplug
parent8d5e98a61f52513749e459c98bcafd060d88b79c (diff)
Update to 0111d0f13469831266d716e3b50d580a3e25cff9 from repo http://git.linaro.org/kernel/linux-linaro-stable.git branch linux-linaro-lsk-v3.140111d0f13469831266d716e3b50d580a3e25cff9linux-linaro-stable-3.14
Diffstat (limited to 'memory-hotplug')
-rw-r--r--memory-hotplug/Makefile5
-rw-r--r--memory-hotplug/on-off-test.sh8
2 files changed, 1 insertions, 12 deletions
diff --git a/memory-hotplug/Makefile b/memory-hotplug/Makefile
index d46b8d4..350bfed 100644
--- a/memory-hotplug/Makefile
+++ b/memory-hotplug/Makefile
@@ -1,9 +1,6 @@
all:
run_tests:
- @/bin/bash ./on-off-test.sh -r 2 || echo "memory-hotplug selftests: [FAIL]"
-
-run_full_test:
- @/bin/bash ./on-off-test.sh || echo "memory-hotplug selftests: [FAIL]"
+ @/bin/sh ./on-off-test.sh || echo "memory-hotplug selftests: [FAIL]"
clean:
diff --git a/memory-hotplug/on-off-test.sh b/memory-hotplug/on-off-test.sh
index 6cddde0..a2816f6 100644
--- a/memory-hotplug/on-off-test.sh
+++ b/memory-hotplug/on-off-test.sh
@@ -142,16 +142,10 @@ fi
prerequisite
-echo "Test scope: $ratio% hotplug memory"
-echo -e "\t online all hotplug memory in offline state"
-echo -e "\t offline $ratio% hotplug memory in online state"
-echo -e "\t online all hotplug memory in offline state"
-
#
# Online all hot-pluggable memory
#
for memory in `hotplaggable_offline_memory`; do
- echo offline-online $memory
online_memory_expect_success $memory
done
@@ -160,7 +154,6 @@ done
#
for memory in `hotpluggable_online_memory`; do
if [ $((RANDOM % 100)) -lt $ratio ]; then
- echo online-offline $memory
offline_memory_expect_success $memory
fi
done
@@ -169,7 +162,6 @@ done
# Online all hot-pluggable memory again
#
for memory in `hotplaggable_offline_memory`; do
- echo offline-online $memory
online_memory_expect_success $memory
done