summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-08 17:39:48 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-08 17:39:48 -0500
commit73e1506e3c4740521466617a3b4cc651129d9e16 (patch)
tree8daef88b853dee70c8ce0aa05ae4e8ac23d7b15d
parent45796a86a1572d545b2a4b0074abca7df916def5 (diff)
downloadphoronix-test-suite-upstream-73e1506e3c4740521466617a3b4cc651129d9e16.tar.gz
phoronix-test-suite-upstream-73e1506e3c4740521466617a3b4cc651129d9e16.tar.xz
phoronix-test-suite-upstream-73e1506e3c4740521466617a3b4cc651129d9e16.zip
pts-core: Don't report "6.00 PG" in motherboard string
-rw-r--r--TYDAL-CHANGE-LOG1
-rw-r--r--pts-core/functions/pts-functions_system_hardware.php4
-rw-r--r--pts-core/static/info-strings-remove.txt1
3 files changed, 5 insertions, 1 deletions
diff --git a/TYDAL-CHANGE-LOG b/TYDAL-CHANGE-LOG
index f8f7c96..22c33da 100644
--- a/TYDAL-CHANGE-LOG
+++ b/TYDAL-CHANGE-LOG
@@ -22,6 +22,7 @@ Phoronix Test Suite (Git)
- pts-core: Add and implement default-run and default-benchmark options
- pts-core: Add auto-disks and auto-disk-partitions to automatic population of test profile menus from identifiers
- pts-core: Add initial functions needed for virtual suite support
+- pts-core: Don't report "6.00 PG" in motherboard string
- pts: Remove bonnie test profile until clarifications made
- pts: Add filesystem test suite
- pts: Add jxrendermark as new X Render benchmark test profile
diff --git a/pts-core/functions/pts-functions_system_hardware.php b/pts-core/functions/pts-functions_system_hardware.php
index f5e3286..31c5542 100644
--- a/pts-core/functions/pts-functions_system_hardware.php
+++ b/pts-core/functions/pts-functions_system_hardware.php
@@ -94,12 +94,14 @@ function hw_sys_motherboard_string()
}
}
+ $info = pts_clean_information_string($info);
+
if(empty($info))
{
$info = "Unknown";
}
- return pts_clean_information_string($info);
+ return $info;
}
function hw_sys_chipset_string()
{
diff --git a/pts-core/static/info-strings-remove.txt b/pts-core/static/info-strings-remove.txt
index eef684e..1d426c7 100644
--- a/pts-core/static/info-strings-remove.txt
+++ b/pts-core/static/info-strings-remove.txt
@@ -21,4 +21,5 @@ co. ltd
(tm)
inc.
inc
+6.00 PG
,