diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-05-28 11:04:11 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-05-28 11:04:11 -0400 |
| commit | 02666638d500f977e119d20a976f35fd44e560d0 (patch) | |
| tree | 8eca5d1c7d179ff1c4b03baac9a1cea5e90d39cb /pts/test-resources/compliance-sensors | |
| parent | 2b59cb8874e8481bb8acd9e3551ca8b24fa810e9 (diff) | |
| download | phoronix-test-suite-upstream-02666638d500f977e119d20a976f35fd44e560d0.tar.gz phoronix-test-suite-upstream-02666638d500f977e119d20a976f35fd44e560d0.tar.xz phoronix-test-suite-upstream-02666638d500f977e119d20a976f35fd44e560d0.zip | |
Update to compliance-sensors
Diffstat (limited to 'pts/test-resources/compliance-sensors')
| -rw-r--r-- | pts/test-resources/compliance-sensors/install.sh | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/pts/test-resources/compliance-sensors/install.sh b/pts/test-resources/compliance-sensors/install.sh index 4ef8919..8111792 100644 --- a/pts/test-resources/compliance-sensors/install.sh +++ b/pts/test-resources/compliance-sensors/install.sh @@ -27,9 +27,24 @@ $sensors = array(); $sensor_results = array(); array_push($sensors, read_sensors("VCore")); -array_push($sensors, read_sensors("CPU Fan")); -array_push($sensors, read_sensors("CPU Temp")); -array_push($sensors, read_sensors("Sys Temp")); +array_push($sensors, read_sensors("+3.3V")); +array_push($sensors, read_sensors("+5V")); +array_push($sensors, read_sensors("+12V")); + +$cpu_fan = read_sensors("CPU Fan"); +if(empty($cpu_fan)) + $cpu_fan = read_sensors("fan1"); +array_push($sensors, $cpu_fan); + +$cpu_temp = read_sensors("CPU Temp"); +if(empty($cpu_temp)) + $cpu_temp = read_sensors("temp1"); +array_push($sensors, $cpu_temp); + +$sys_temp = read_sensors("Sys Temp"); +if(empty($sys_temp)) + $sys_temp = read_sensors("temp2"); +array_push($sensors, $sys_temp); foreach($sensors as $single_sensor) { |