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

pts-core: Last minute tweaks

Browse Source
This commit is contained in:
Michael Larabel
2021-12-25 03:58:10 -06:00
parent e8548cbf46
commit 9d91e75458
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pts-core/objects/client/pts_client.php
View File

@@ -355,7 +355,6 @@ class pts_client
$env_variables = array(
'PTS_VERSION' => PTS_VERSION,
'PTS_CODENAME' => PTS_CODENAME,
'PTS_DIR' => PTS_PATH,
'PTS_LAUNCHER' => getenv('PTS_LAUNCHER'),
'PHP_BIN' => PHP_BIN,
@@ -636,12 +635,16 @@ class pts_client
'glxinfo',
'clinfo',
'vulkaninfo',
'uname -a',
// 'udisks --dump',
//'upower --dump',
'dmidecode',
);
if(!phodevi::is_windows())
{
// uname is provided by Cygwin but executing it messes up terminal color/bold formatting afterwards (unescaped chars?)
$system_log_commands[] = 'uname -a';
}
if(phodevi::is_linux() && phodevi::read_property('system', 'filesystem') == 'ext4' && phodevi::is_root())
{
$system_log_commands[] = 'dumpe2fs -h ' . phodevi::read_property('disk', 'device-providing-storage');

2
pts-core/objects/client/pts_documentation.php
View File

@@ -55,7 +55,7 @@ class pts_documentation
$option_php = basename($option_php_file, '.php');
$name = str_replace('_', '-', $option_php);
if(!in_array(pts_strings::first_in_string($name, '-'), array('dump', 'task')))
if(true)
{
include_once($option_php_file);

2
pts-core/objects/client/pts_tests.php
View File

@@ -122,7 +122,7 @@ class pts_tests
return $error;
}
foreach(array('fatal error', 'error while loading', 'undefined reference', 'cannot find -l', 'error:', 'returned 1 exit status', 'not found', 'child process excited with status', 'error opening archive', 'failed to load', 'fatal', 'illegal argument', 'is required to build', 'or higher is required', ': No such file or directory', 'not enough slots', 'mpirun noticed that process', 'permission denied', 'connection refused') as $error_string)
foreach(array('fatal error', 'error while loading', 'undefined reference', 'cannot find -l', 'error:', 'returned 1 exit status', 'not found', 'child process excited with status', 'error opening archive', 'failed to load', 'fatal', 'illegal argument', 'is required to build', 'or higher is required', ': No such file or directory', 'not enough slots', 'mpirun noticed that process', 'permission denied', 'connection refused', 'MPI_ABORT was invoked') as $error_string)
{
$lf = $log_file;
if(($e = strripos($lf, $error_string)) !== false)