Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 5/21/13 15:49
Recent Commits
>
--git a/CHANGE-LOG b/CHANGE-LOG
index 63365b0..818965e 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -5,6 +5,7 @@ Phoronix Test Suite (Git)
- pts-core: Support download caches at /run/media/*/*/download-cache/
- pts-core: Set SKIP_TEST_SUPPORT_CHECKS=1 environment variable for debugging purposes to run tests on unsupported platforms
- pts_Graph: Only render as much room for pts_OverViewGraph as there are for what will be rendered (bar graph values)
+- phodevi: Ensure DVD drives don't get reported on BSD operating systems when requesting disk drives
- system_monitor: Add support for handling i915_energy monitor reading in microJoules for each test run
- system_monitor: Place timer support for individual test runs within the module
diff --git a/pts-core/objects/phodevi/components/phodevi_disk.php b/pts-core/objects/phodevi/components/phodevi_disk.php
index 6680278..867b06a 100644
--- a/pts-core/objects/phodevi/components/phodevi_disk.php
+++ b/pts-core/objects/phodevi/components/phodevi_disk.php
@@ -145,7 +145,7 @@ class phodevi_disk extends phodevi_device_interface
{
$disk = phodevi_bsd_parser::read_sysctl('dev.ad.' . $i . '.%desc');
- if($disk != false)
+ if($disk != false && strpos($disk, 'DVD') === false)
{
array_push($disks, $disk);
}
@@ -160,7 +160,7 @@ class phodevi_disk extends phodevi_device_interface
foreach(explode(PHP_EOL, $camcontrol) as $line)
{
- if(substr($line, 0, 1) == '<' && ($model_end = strpos($line, '>')) !== false)
+ if(substr($line, 0, 1) == '<' && ($model_end = strpos($line, '>')) !== false && strpos($line, 'DVD') === false)
{
$disk = self::prepend_disk_vendor(substr($line, 1, ($model_end - 1)));
array_push(
Copyright © 2013 by Phoronix Media