diff options
| author | zhanghongbo <hongbo.zhang@stericsson.com> | 2012-05-11 15:07:56 +0800 |
|---|---|---|
| committer | hongbo.zhang <hongbo.zhang@linaro.com> | 2012-11-28 17:07:21 +0800 |
| commit | 4dbc977bc54c90b5cbbb1b6db0ae0d7265b5fa81 (patch) | |
| tree | 1e1acde28726a97c6ae789de63c7b1282b854dae | |
| parent | 4416a528c3ac104f7bfb4e8df81ca8c3d097d2aa (diff) | |
check if glmark2 is there before excuting it.
Signed-off-by: hongbo.zhang <hongbo.zhang@linaro.com>
| -rwxr-xr-x | thermal/thermal_03.sh | 13 | ||||
| -rwxr-xr-x | thermal/thermal_06.sh | 12 |
2 files changed, 19 insertions, 6 deletions
diff --git a/thermal/thermal_03.sh b/thermal/thermal_03.sh index 4bb3982..86bdffd 100755 --- a/thermal/thermal_03.sh +++ b/thermal/thermal_03.sh @@ -29,7 +29,7 @@ source ../include/functions.sh source ../include/thermal_functions.sh CPU_HEAT_BIN=../utils/heat_cpu -GPU_HEAT_BIN=glmark2 +GPU_HEAT_BIN=/usr/bin/glmark2 check_temperature_change() { local dirpath=$THERMAL_PATH/$1 @@ -41,11 +41,18 @@ check_temperature_change() { local init_temp=$(cat $dirpath/temp) $CPU_HEAT_BIN & cpu_pid=$(ps | grep heat_cpu| awk '{print $1}') + test -z $cpu_pid && cpu_pid=0 check "start cpu heat binary" "test $cpu_pid -ne 0" - $GPU_HEAT_BIN & - gpu_pid=$(ps | grep $GPU_HEAT_BIN| awk '{print $1}') + if [ -x $GPU_HEAT_BIN ]; then + $GPU_HEAT_BIN & + gpu_pid=$(ps | grep $GPU_HEAT_BIN| awk '{print $1}') + test -z $gpu_pid && gpu_pid=0 + else + echo "glmark2 not found." 1>&2 + fi check "start gpu heat binary" "test $gpu_pid -ne 0" + sleep 5 local final_temp=$(cat $dirpath/temp) if [ $cpu_pid != 0 ]; then diff --git a/thermal/thermal_06.sh b/thermal/thermal_06.sh index 0960cdb..1497bcc 100755 --- a/thermal/thermal_06.sh +++ b/thermal/thermal_06.sh @@ -29,7 +29,7 @@ source ../include/functions.sh source ../include/thermal_functions.sh CPU_HEAT_BIN=../utils/heat_cpu -GPU_HEAT_BIN=glmark2 +GPU_HEAT_BIN=/usr/bin/glmark2 TEST_LOOP=100 TRIP_CROSSED_COUNT= @@ -49,10 +49,16 @@ check_trip_point_change() { local trip_type_path=0 $CPU_HEAT_BIN & cpu_pid=$(ps | grep heat_cpu| awk '{print $1}') + test -z $cpu_pid && cpu_pid=0 check "start cpu heat binary" "test $cpu_pid -ne 0" - $GPU_HEAT_BIN & - gpu_pid=$(ps | grep $GPU_HEAT_BIN| awk '{print $1}') + if [ -x $GPU_HEAT_BIN ]; then + $GPU_HEAT_BIN & + gpu_pid=$(ps | grep $GPU_HEAT_BIN| awk '{print $1}') + test -z $gpu_pid && gpu_pid=0 + else + echo "glmark2 not found." 1>&2 + fi check "start gpu heat binary" "test $gpu_pid -ne 0" local index=0 |