diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-08-09 13:18:20 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-08-09 13:18:20 -0400 |
| commit | 537b80733c61e0f062c69ebeb807477718ac9495 (patch) | |
| tree | b8623d8f502fe04974bdeb0724cc51228009a7f3 /pts/test-resources/compliance-sensors | |
| parent | 3f24dbb4b04dba94d898fb99901abdafa18141e7 (diff) | |
| download | phoronix-test-suite-upstream-537b80733c61e0f062c69ebeb807477718ac9495.tar.gz phoronix-test-suite-upstream-537b80733c61e0f062c69ebeb807477718ac9495.tar.xz phoronix-test-suite-upstream-537b80733c61e0f062c69ebeb807477718ac9495.zip | |
pts: Improved sensor detection for compliance-sensors test
Diffstat (limited to 'pts/test-resources/compliance-sensors')
| -rw-r--r-- | pts/test-resources/compliance-sensors/install.sh | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pts/test-resources/compliance-sensors/install.sh b/pts/test-resources/compliance-sensors/install.sh index 8111792..c88fb0c 100644 --- a/pts/test-resources/compliance-sensors/install.sh +++ b/pts/test-resources/compliance-sensors/install.sh @@ -27,9 +27,21 @@ $sensors = array(); $sensor_results = array(); array_push($sensors, read_sensors("VCore")); -array_push($sensors, read_sensors("+3.3V")); -array_push($sensors, read_sensors("+5V")); -array_push($sensors, read_sensors("+12V")); + +$v3 = read_sensors("+3.3V"); +if(empty($v3)) + $v3 = read_sensors("V3.3"); +array_push($sensors, $v3); + +$v5 = read_sensors("+5V"); +if(empty($v5)) + $v5 = read_sensors("V5"); +array_push($sensors, $v5); + +$v12 = read_sensors("+12V"); +if(empty($v12)) + $v12 = read_sensors("V12"); +array_push($sensors, $v12); $cpu_fan = read_sensors("CPU Fan"); if(empty($cpu_fan)) @@ -43,6 +55,8 @@ array_push($sensors, $cpu_temp); $sys_temp = read_sensors("Sys Temp"); if(empty($sys_temp)) + $sys_temp = read_sensors("Board Temp"); +if(empty($sys_temp)) $sys_temp = read_sensors("temp2"); array_push($sensors, $sys_temp); |