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

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Wed 7/23/14 10:50

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Wed 7/23/14 10:50
Michael Larabel  
pts_webui: SERVER_ADDR... 
Fri 7/18/14 8:58
Michael Larabel  
pts-core: Sanitize... 
Fri 7/11/14 8:58
Michael Larabel  
Phoronix Test Suite 5.2.1... 
Sun 7/6/14 16:07
Michael Larabel  
phodevi: Add DDE / Deepin... 
Wed 6/25/14 10:04
Michael Larabel  
pts-core: Rework... 
Wed 6/25/14 9:25
Michael Larabel  
pts-core: Don't check... 
 
> --git a/pts-core/objects/phodevi/components/phodevi_system.php b/pts-core/objects/phodevi/components/phodevi_system.php
index 04d5070
..ad9b027 100644
--- a/pts-core/objects/phodevi/components/phodevi_system.php
+++ b/pts-core/objects/phodevi/components/phodevi_system.php
@@ -1189,15 +1189,36 @@ class phodevi_system extends phodevi_device_interface
     
}
     public static function 
sw_display_server()
     {
-        
$info null;
+        
$display_servers = array();

         if(
phodevi::is_windows())
         {
             
// TODO: determine what to do for Windows support
-            $info false;
         }
         else
         {
+            if(
pts_client::is_process_running('weston'))
+            {
+                
$info 'Wayland Weston';
+                
$vinfo trim(shell_exec('weston --version 2>&1'));
+
+                if(
pts_strings::last_in_string($vinfo) && pts_strings::is_version($vinfo))
+                {
+                    
$info .= ' ' pts_strings::last_in_string($vinfo);
+                }
+                    
array_push($display_servers$info);
+            }
+            if(
pts_client::is_process_running('unity-system-compositor'))
+            {
+                
$unity_system_comp trim(str_replace('unity-system-compositor'nullshell_exec('unity-system-compositor --version 2>&1')));
+
+                if(
pts_strings::is_version($unity_system_comp))
+                {
+                    
array_push($display_servers'Unity-System-Compositor ' $unity_system_comp);
+                }
+
+            }
+
             if((
$x_bin pts_client::executable_in_path('Xorg')) || ($x_bin pts_client::executable_in_path('X')))
             {
                 
// Find graphics subsystem version
@@ -1220,37 +1241,16 @@ class phodevi_system extends phodevi_device_interface

                 
if($info != null)
                 {
-                    
$info 'X Server ' $info;
+                    
array_push($display_servers'X Server ' $info);
                 }
             }
-            else if(
pts_client::is_process_running('weston'))
+            if(
pts_client::is_process_running('surfaceflinger'))
             {
-                
$info 'Wayland Weston';
-                
$vinfo trim(shell_exec('weston --version 2>&1'));
-
-                if(
pts_strings::last_in_string($vinfo))
-                {
-                    
$info .= ' ' pts_strings::last_in_string($vinfo);
-                }
-            }
-            else if(
pts_client::is_process_running('surfaceflinger'))
-            {
-                
$info 'SurfaceFlinger';
-            }
-
-            if(
pts_client::is_process_running('unity-system-compositor'))
-            {
-                
$unity_system_comp trim(str_replace('unity-system-compositor'nullshell_exec('unity-system-compositor --version 2>&1')));
-
-                if(
pts_strings::is_version($unity_system_comp))
-                {
-                    
$info 'Unity-System-Compositor ' $unity_system_comp . ($info != null ' + ' $info null);
-                }
-
+                
array_push($display_servers'SurfaceFlinger');
             }
         }

-        return 
$info;
+        return 
implode(' + '$display_servers);
     }
     public static function 
sw_display_driver($with_version true)
     {
<
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media