projects / phoronix-test-suite.git / commitdiff
Build Results
 
Summary

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Fri 11/21/14 15:52

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Fri 11/21/14 15:52
Michael Larabel  
phoromatic: Fix salted... 
Fri 11/21/14 10:56
Michael Larabel  
 
Fri 11/21/14 10:52
Michael Larabel  
phoromatic: Allow... 
Fri 11/21/14 10:34
Michael Larabel  
phoromatic: Add... 
Wed 11/19/14 9:58
Michael Larabel  
pts-core: Assume http://... 
Wed 11/19/14 9:53
Michael Larabel  
pts-core: Check for file... 
 
> --git a/CHANGE-LOG b/CHANGE-LOG
index 484a216
..306f2a4 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -5,+5,@@ Phoronix Test Suite (Git)
 - 
pts-coreImprovement for detecting errors from failed test installations
 
pts-coreAllow "Deprecated" flag for ProfileStatus in the XML test profile schema
 
pts-coreSupport for scanning test run log files automatically to look for errors when tests fail to execute
+- phodeviFix to improve Xfce version detection when Gtk-Warnings are thrown before the version string

 Phoronix Test Suite 4.4 Milestone 1
 23 January 2013
diff 
--git a/pts-core/objects/client/pts_test_execution.php b/pts-core/objects/client/pts_test_execution.php
index 601ead0
..73c4130 100644
--- a/pts-core/objects/client/pts_test_execution.php
+++ b/pts-core/objects/client/pts_test_execution.php
@@ -210,+210,@@ class pts_test_execution

                 
if(!empty($test_result))
                 {
-                    if(
$test_run_time && intval($test_result) == $test_result && $test_run_request->test_profile->get_estimated_run_time() > 60)
+                    if(
$test_run_time && intval($test_result) == $test_result && $test_run_request->test_profile->get_estimated_run_time() > 60)
                     {
-                        
// If the test ended in less than 5 seconds, outputted some int, and normally the test takes much longer, then it's likely some invalid run
+                        // If the test ended in less than 3 seconds, outputted some int, and normally the test takes much longer, then it's likely some invalid run
                         
pts_client::$display->test_run_instance_error('The test run ended prematurely.');
                         if(
$is_expected_last_run && is_file($test_log_file))
                         {
diff --git a/pts-core/objects/phodevi/components/phodevi_system.php b/pts-core/objects/phodevi/components/phodevi_system.php
index 899a987
..2ec4940 100644
--- a/pts-core/objects/phodevi/components/phodevi_system.php
+++ b/pts-core/objects/phodevi/components/phodevi_system.php
@@ -1010,+1010,@@ class phodevi_system extends phodevi_device_interface
             $desktop_environment 
'Xfce';
             
$xfce_output trim(shell_exec('xfce4-session-settings --version 2>&1'));

-            if((
$open strpos($xfce_output'(')) > 0)
+            if((
$open strpos($xfce_output'(Xfce')) > 0)
             {
                 
$xfce_output substr($xfce_outputstrpos($xfce_output' '$open) + 1);
                 
$desktop_version substr($xfce_output0strpos($xfce_output')'));
<
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media