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 2f162b8..56579d0 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -7,6 +7,7 @@ Phoronix Test Suite (Git)
- pts-core: Streamline detailed-system-info collection
- pts-core: Invalid command improvements
- pts-core: Various alterations
+- pts-core: Make greater use of trigger_error
- phodevi: Support to attempt to detect the file-system underneath ecryptfs
- pts-core: Debian control script update
diff --git a/pts-core/commands/openbenchmarking_login.php b/pts-core/commands/openbenchmarking_login.php
index ad2c084..0970229 100644
--- a/pts-core/commands/openbenchmarking_login.php
+++ b/pts-core/commands/openbenchmarking_login.php
@@ -48,7 +48,7 @@ class openbenchmarking_login implements pts_option_interface
if(isset($json['openbenchmarking']['response']['error']))
{
- echo PHP_EOL . PHP_EOL . 'ERROR: ' . $json['openbenchmarking']['response']['error'] . PHP_EOL . PHP_EOL;
+ trigger_error($json['openbenchmarking']['response']['error'], E_USER_ERROR);
pts_storage_object::remove_in_file(PTS_CORE_STORAGE, 'openbenchmarking');
}
else
diff --git a/pts-core/objects/client/pts_openbenchmarking_client.php b/pts-core/objects/client/pts_openbenchmarking_client.php
index 0771e38..4a44b24 100644
--- a/pts-core/objects/client/pts_openbenchmarking_client.php
+++ b/pts-core/objects/client/pts_openbenchmarking_client.php
@@ -149,13 +149,13 @@ class pts_openbenchmarking_client
if(!is_array($json_response))
{
- echo PHP_EOL . 'ERROR: Unhandled Exception' . PHP_EOL;
+ trigger_error('Unhandled Exception', E_USER_ERROR);
return false;
}
if(isset($json_response['openbenchmarking']['upload']['error']))
{
- echo PHP_EOL . 'ERROR: ' . $json_response['openbenchmarking']['upload']['error'] . PHP_EOL;
+ trigger_error($json_response['openbenchmarking']['upload']['error'], E_USER_ERROR);
}
if(isset($json_response['openbenchmarking']['upload']['url']))
{
diff --git a/pts-core/objects/client/pts_test_installer.php b/pts-core/objects/client/pts_test_installer.php
index f84ac7a..181106a 100644
--- a/pts-core/objects/client/pts_test_installer.php
+++ b/pts-core/objects/client/pts_test_installer.php
@@ -42,7 +42,7 @@ class pts_test_installer
// Install tests
if(!is_writable(pts_client::test_install_root_path()))
{
- echo PHP_EOL . 'ERROR: The test installation directory is not writable.' . PHP_EOL . 'Location: ' . pts_client::test_install_root_path() . PHP_EOL;
+ trigger_error('The test installation directory is not writable.' . PHP_EOL . 'Location: ' . pts_client::test_install_root_path(), E_USER_ERROR);
return false;
}
diff --git a/pts-core/objects/pts_openbenchmarking.php b/pts-core/objects/pts_openbenchmarking.php
index 768ca97..47e1719 100644
--- a/pts-core/objects/pts_openbenchmarking.php
+++ b/pts-core/objects/pts_openbenchmarking.php
@@ -145,12 +145,12 @@ class pts_openbenchmarking
}
else
{
- echo PHP_EOL . 'ERROR: Validating the result file schema failed.' . PHP_EOL . PHP_EOL;
+ trigger_error('Validating the result file schema failed.', E_USER_ERROR);
}
}
else if(PTS_IS_CLIENT && isset($json_response['openbenchmarking']['result']['error']))
{
- echo PHP_EOL . 'ERROR: ' . $json_response['openbenchmarking']['result']['error'] . PHP_EOL . PHP_EOL;
+ trigger_error($json_response['openbenchmarking']['result']['error'], E_USER_ERROR);
}
return $valid;
diff --git a/pts-core/objects/pts_result_file_analyzer.php b/pts-core/objects/pts_result_file_analyzer.php
index d68186b..adcea14 100644
--- a/pts-core/objects/pts_result_file_analyzer.php
+++ b/pts-core/objects/pts_result_file_analyzer.php
@@ -67,6 +67,7 @@ class pts_result_file_analyzer
array('Processor', 'Motherboard', 'Chipset', 'Audio', 'Network'), // Processor comparison
array('Processor', 'Motherboard', 'Chipset', 'Network'), // Processor comparison
array('Processor', 'Chipset', 'Graphics'),
+ array('Processor', 'Graphics'),
array('Processor', 'Chipset'), // Processor comparison - Sandy/Ivy Bridge for Intel will change CPU/chipset reporting when still using same mobo
array('Motherboard', 'Chipset'), // Motherboard comparison
array('Motherboard', 'Chipset', 'Audio', 'Network') // Also a potential motherboard comparison
<
Copyright © 2013 by Phoronix Media