josh/phoronix-test-suite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pts-core: Few random fixes

Browse Source
This commit is contained in:
Michael Larabel
2023-11-04 13:50:48 -05:00
parent f241b9526d
commit 93d7e6dec6
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pts-core/commands/dump_ob_to_ae_db.php
View File

@@ -3,8 +3,8 @@
/*
Phoronix Test Suite
URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
Copyright (C) 2019 - 2022, Phoronix Media
Copyright (C) 2019 - 2022, Michael Larabel
Copyright (C) 2019 - 2023, Phoronix Media
Copyright (C) 2019 - 2023, Michael Larabel
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -190,12 +190,11 @@ class dump_ob_to_ae_db implements pts_option_interface
$system_identifier = $buffer_item->get_result_identifier();
$system_layer = isset($system_data[$system_identifier]['System Layer']) ? $system_data[$system_identifier]['System Layer'] : null;
$hw_type = $ro->test_profile->get_test_hardware_type();
$args_desc = $ro->get_arguments_description();
// Since some tests could stress multiple subsystems, see what the argument descriptions string says
if(strpos($args_desc, ' GPU') || strpos($args_desc, ' CUDA') || strpos($args_desc, ' OptiX') || strpos($args_desc, ' OpenCL'))
if(strpos($args_desc, ' GPU') || strpos($args_desc, 'GPU ') || strpos($args_desc, ' CUDA') || strpos($args_desc, ' OptiX') || strpos($args_desc, ' OpenCL') || strpos($args_desc, 'SYCL'))
{
$hw_type = 'Graphics';
}

2
pts-core/commands/upload_test_profile.php
View File

@@ -30,7 +30,7 @@ class upload_test_profile implements pts_option_interface
if(pts_openbenchmarking_client::user_name() == false)
{
echo PHP_EOL . 'You must first be logged into an OpenBenchmarking.org account.' . PHP_EOL;
echo PHP_EOL . 'Create An Account: http://openbenchmarking.org/';
echo PHP_EOL . 'Create An Account: https://openbenchmarking.org/';
echo PHP_EOL . 'Log-In Command: phoronix-test-suite openbenchmarking-setup' . PHP_EOL . PHP_EOL;
return false;
}

2
pts-core/commands/upload_test_suite.php
View File

@@ -36,7 +36,7 @@ class upload_test_suite implements pts_option_interface
if(pts_openbenchmarking_client::user_name() == false)
{
echo PHP_EOL . 'You must first be logged into an OpenBenchmarking.org account.' . PHP_EOL;
echo PHP_EOL . 'Create An Account: http://openbenchmarking.org/';
echo PHP_EOL . 'Create An Account: https://openbenchmarking.org/';
echo PHP_EOL . 'Log-In Command: phoronix-test-suite openbenchmarking-setup' . PHP_EOL . PHP_EOL;
return false;
}

5
pts-core/objects/phodevi/components/phodevi_cpu.php
View File

@@ -539,6 +539,11 @@ class phodevi_cpu extends phodevi_device_interface
if($physical_cpu_count == 1 || empty($physical_cpu_count))
{
// Just one processor
if(isset($cpu_strings[0]) && !empty($cpu_strings[0]))
{
// This fixes some Intel CPUs only displaying "Intel" for model due to " (R) " in strings with below check
$cpu_strings[0] = str_replace(' (R)', ' ', $cpu_strings[0]);
}
if(isset($cpu_strings[0]) && ($cut = strpos($cpu_strings[0], ' (')) !== false)
{
$cpu_strings[0] = substr($cpu_strings[0], 0, $cut);

6
pts-core/objects/phodevi/components/phodevi_system.php
View File

@@ -1438,7 +1438,11 @@ class phodevi_system extends phodevi_device_interface
{
// KDE 5.x
$desktop_environment = 'KDE Plasma';
$desktop_version = pts_strings::last_in_string(trim(shell_exec('plasmashell --version 2> /dev/null')));
$desktop_version = shell_exec('plasmashell --version 2> /dev/null');
if(!empty($desktop_version))
{
$desktop_version = pts_strings::last_in_string(trim($desktop_version));
}
}
else if(($kde5 = pts_client::is_process_running('kded5')))
{