Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Fri 5/17/13 22:52
Recent Commits
>
--git a/CHANGE-LOG b/CHANGE-LOG
index b9ddb4e..dd7425f 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -4,6 +4,7 @@ Phoronix Test Suite (Git)
- pts-core: Fix for running result files that have forced AA/AF levels and then fail to merge
- pts-core: On missing timezone setting, set to UTC if the PHP version is 5.3.0 or newer, emits a warning otherwise
+- phodevi: Fix for reporting fglrx version string with newer versions of ATI Catalyst Linux driver
- tandem_Xml: XML parsing fix when reading
- pts: Fix for prey test profile
diff --git a/pts-core/objects/phodevi/phodevi_system.php b/pts-core/objects/phodevi/phodevi_system.php
index 25ba84d..6adeae6 100644
--- a/pts-core/objects/phodevi/phodevi_system.php
+++ b/pts-core/objects/phodevi/phodevi_system.php
@@ -767,23 +767,25 @@ class phodevi_system extends pts_device_interface
$ddx_info = "";
$dri_driver = phodevi::read_property("system", "dri-display-driver");
- if(!empty($dri_driver))
+ if(empty($dri_driver))
{
- $driver_version = phodevi_parser::read_xorg_module_version($dri_driver . "_drv");
-
- if(!empty($driver_version))
+ if(IS_ATI_GRAPHICS)
{
- $ddx_info = $dri_driver . " " . $driver_version;
+ $dri_driver = "fglrx";
+ }
+ if(IS_MESA_GRAPHICS && stripos(phodevi::read_name("gpu"), "NVIDIA") !== false)
+ {
+ $dri_driver = "nv";
}
}
- else if(IS_MESA_GRAPHICS && stripos(phodevi::read_name("gpu"), "NVIDIA") !== false)
+
+ if(!empty($dri_driver))
{
- // xf86-video-nv is an open-source driver but currently doesn't support DRI
- $nv_driver_version = phodevi_parser::read_xorg_module_version("nv_drv.so");
+ $driver_version = phodevi_parser::read_xorg_module_version($dri_driver . "_drv");
- if(!empty($nv_driver_version))
+ if(!empty($driver_version))
{
- $ddx_info = "nv " . $nv_driver_version;
+ $ddx_info = $dri_driver . " " . $driver_version;
}
}
diff --git a/pts/test-resources/prey/install.sh b/pts/test-resources/prey/install.sh
index a81b970..63d9080 100755
--- a/pts/test-resources/prey/install.sh
+++ b/pts/test-resources/prey/install.sh
@@ -26,6 +26,5 @@ tar -C $DEBUG_REAL_HOME/.prey/base/ -jxf prey-retail-client-pts-1.tar.bz2
echo "#!/bin/sh
cd data/prey-linux-x86/
-./prey.x86 \$@ > \$LOG_FILE
-cat \$LOG_FILE | grep fps" > prey
+./prey.x86 \$@ > \$LOG_FILE" > prey
chm
Copyright © 2013 by Phoronix Media