Merge thermal_functions.sh into functions.sh

In the process of combining all function libraries into
one. Start with merging thermal_functions.sh into
function.sh to make it easier for maintenance.

Also modify the thermal subtests to source the
functions.sh file only.

Signed-off-by: Lisa Nguyen <lisa.nguyen@linaro.org>

8 files changed, 0 insertions, 8 deletions

diff --git a/thermal/thermal_00.sh b/thermal/thermal_00.sh
index 302858f..1479a02 100755
--- a/thermal/thermal_00.sh
+++ b/thermal/thermal_00.sh
@@ -26,7 +26,6 @@
 # URL : https://wiki.linaro.org/WorkingGroups/PowerManagement/Doc/QA/Scripts#thermal_00
 
 . ../include/functions.sh
-. ../include/thermal_functions.sh
 
 check_cooling_device_type() {
     all_zones=$(ls $THERMAL_PATH | grep "cooling_device['$MAX_CDEV']")
diff --git a/thermal/thermal_01.sh b/thermal/thermal_01.sh
index 94bb26b..34e8f19 100755
--- a/thermal/thermal_01.sh
+++ b/thermal/thermal_01.sh
@@ -26,7 +26,6 @@
 # URL : https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/TestSuite/PmQaSpecification#thermal_01
 
 . ../include/functions.sh
-. ../include/thermal_functions.sh
 
 ATTRIBUTES="mode temp type uevent"
 
diff --git a/thermal/thermal_02.sh b/thermal/thermal_02.sh
index 856d069..a4eb800 100755
--- a/thermal/thermal_02.sh
+++ b/thermal/thermal_02.sh
@@ -26,7 +26,6 @@
 # URL : https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/TestSuite/PmQaSpecification#thermal_02
 
 . ../include/functions.sh
-. ../include/thermal_functions.sh
 
 CDEV_ATTRIBUTES="cur_state max_state type uevent"
 
diff --git a/thermal/thermal_03.sh b/thermal/thermal_03.sh
index 9704b74..2883174 100755
--- a/thermal/thermal_03.sh
+++ b/thermal/thermal_03.sh
@@ -26,7 +26,6 @@
 # URL : https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/TestSuite/PmQaSpecification#thermal_03
 
 . ../include/functions.sh
-. ../include/thermal_functions.sh
 
 CPU_HEAT_BIN=../utils/heat_cpu
 cpu_pid=0
diff --git a/thermal/thermal_04.sh b/thermal/thermal_04.sh
index b290c5a..e2bd996 100755
--- a/thermal/thermal_04.sh
+++ b/thermal/thermal_04.sh
@@ -26,7 +26,6 @@
 # URL : https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/TestSuite/PmQaSpecification#thermal_04
 
 . ../include/functions.sh
-. ../include/thermal_functions.sh
 HEAT_CPU_MODERATE=../utils/heat_cpu
 pid=0
 
diff --git a/thermal/thermal_05.sh b/thermal/thermal_05.sh
index 2e7f080..bc05e1b 100755
--- a/thermal/thermal_05.sh
+++ b/thermal/thermal_05.sh
@@ -26,7 +26,6 @@
 # URL : https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/TestSuite/PmQaSpecification#thermal_05
 
 . ../include/functions.sh
-. ../include/thermal_functions.sh
 
 verify_cpufreq_cooling_device_action() {
     dirpath=$THERMAL_PATH/$1
diff --git a/thermal/thermal_06.sh b/thermal/thermal_06.sh
index 8c42fa9..9c744f1 100755
--- a/thermal/thermal_06.sh
+++ b/thermal/thermal_06.sh
@@ -26,7 +26,6 @@
 # URL : https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/TestSuite/PmQaSpecification#thermal_06
 
 . ../include/functions.sh
-. ../include/thermal_functions.sh
 
 TEST_LOOP=100
 CPU_HEAT_BIN=../utils/heat_cpu
diff --git a/thermal/thermal_sanity.sh b/thermal/thermal_sanity.sh
index 1e5b5af..6287b80 100755
--- a/thermal/thermal_sanity.sh
+++ b/thermal/thermal_sanity.sh
@@ -24,7 +24,6 @@
 #
 
 . ../include/functions.sh
-. ../include/thermal_functions.sh
 
 is_root
 if [ $? -ne 0 ]; then