CPU: freq tests updated

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

3 files changed, 28 insertions, 67 deletions

diff --git a/cpufreq.sh b/cpu-freq-tests.sh
index 9624b69..961577b 100755
--- a/cpufreq.sh
+++ b/cpu-freq-tests.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
 # protect against multiple inclusion
-if [ $FILE_CPUFREQ ]; then
+if [ $FILE_CPU_FREQ_TESTS ]; then
 	return 0
 else
-	FILE_CPUFREQ=DONE
+	FILE_CPU_FREQ_TESTS=DONE
 fi
 
-source cpu.sh
+source cpu-tests.sh
+source cpu-governor-tests.sh
 
 # GLOBALS
 CPU_PATH="/sys/devices/system/cpu"
@@ -248,45 +249,6 @@ cpufreq_basic_tests()
 	# Test all frequencies
 	shuffle_frequency_for_all_cpus 2
 }
-
-# Suspend/resume
-# $1: "suspend" or "hibernate", $2: loop count
-do_suspend()
-{
-	echo "** Test: Running ${FUNCNAME[0]}: Trying $1 for $2 loops **"
-	echo ""
-
-	# Is the directory available
-	if [ ! -d /sys/power/ -o ! -f /sys/power/state ]; then
-		echo "/sys/power/state not available"
-		return 1
-	fi
-
-	if [ $1 = "suspend" ]; then
-		filename="mem"
-	elif [ $1 = "hibernate" ]; then
-		filename="disk"
-	fi
-
-	if [ -n $filename ]; then
-		present=$(cat /sys/power/state | grep $filename)
-
-		if [ -z "$present" ]; then
-			echo "Tried to $1 but $filename isn't present in /sys/power/state"
-			return 1;
-		else
-			for i in `seq 1 $2`; do
-				echo "Starting $1"
-				echo $filename > /sys/power/state
-				echo "Came out of $1"
-
-				echo "Do basic tests after finishing $1 to verify cpufreq state"
-				echo ""
-				cpufreq_basic_tests
-			done
-		fi
-	fi
-
-	echo "------------------------------------------------"
-	echo ""
-}
+clear_dumps
+cpufreq_basic_tests
+dmesg_dumps
diff --git a/governor.sh b/cpu-governor-tests.sh
index 2d03c80..1f84e3c 100755
--- a/governor.sh
+++ b/cpu-governor-tests.sh
@@ -3,14 +3,14 @@
 # Test governors
 
 # protect against multiple inclusion
-if [ $FILE_GOVERNOR ]; then
+if [ $FILE_CPU_GOVERNOR_TESTS ]; then
 	return 0
 else
-	FILE_GOVERNOR=DONE
+	FILE_CPU_GOVERNOR_TESTS=DONE
 fi
 
-source cpu.sh
-source cpufreq.sh
+source cpu-tests.sh
+source cpu-freq-tests.sh
 
 # Find governor's directory path
 # $1: cpu, $2: governor
diff --git a/cpu.sh b/cpu-tests.sh
index a7c846f..1b61125 100755
--- a/cpu.sh
+++ b/cpu-tests.sh
@@ -3,13 +3,13 @@
 # CPU helpers
 
 # protect against multiple inclusion
-if [ $FILE_CPU ]; then
+if [ $FILE_CPU_TESTS ]; then
 	return 0
 else
-	FILE_CPU=DONE
+	FILE_CPU_TESTS=DONE
 fi
 
-source cpufreq.sh
+source cpu-freq-tests.sh
 
 offline_cpu()
 {
@@ -27,6 +27,20 @@ offline_online_cpu()
 	online_cpu $1
 }
 
+for_each_cpu() {
+	cpus=$(ls $CPU_PATH | grep "cpu[0-9].*")
+	for cpu in $cpus; do
+		$@ $cpu
+	done
+}
+
+for_each_non_boot_cpu() {
+	cpus=$(ls $CPU_PATH | grep "cpu[1-9].*")
+	for cpu in $cpus; do
+		$@ $cpu
+	done
+}
+
 # Offline + online CPUs
 # param: number of times we want to run the loop
 hotplug_1_by_1()
@@ -56,20 +70,6 @@ hotplug_together()
 	echo ""
 }
 
-for_each_cpu() {
-	cpus=$(ls $CPU_PATH | grep "cpu[0-9].*")
-	for cpu in $cpus; do
-		$@ $cpu
-	done
-}
-
-for_each_non_boot_cpu() {
-	cpus=$(ls $CPU_PATH | grep "cpu[1-9].*")
-	for cpu in $cpus; do
-		$@ $cpu
-	done
-}
-
 # Prints warning for all CPUs with missing cpufreq directory
 print_unmanaged_cpus()
 {
@@ -86,6 +86,5 @@ count_cpufreq_managed_cpus()
 			let count=count+1;
 		fi
 	done
-
 	echo $count;
 }