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-19 08:15:25 -06:00
parent 93d7e6dec6
commit af4db559fc
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pts-core/commands/debug_dependency_handler.php
View File

@@ -31,6 +31,10 @@ class debug_dependency_handler implements pts_option_interface
foreach($exdep_parser->get_available_packages() as $pkg)
{
$pkg_data = $exdep_parser->get_package_data($pkg);
if(!isset($pkg_data['file_check']) || empty($pkg_data['file_check']))
{
continue;
}
$files = explode(' ', str_replace(array(' OR ', ', '), ' ', $pkg_data['file_check']));
foreach($files as $file)
{

9
pts-core/commands/info.php
View File

@@ -59,8 +59,11 @@ class info implements pts_option_interface
$unique_tests = array();
foreach($o->get_contained_test_result_objects() as $result_obj)
{
$table[] = array(pts_client::cli_just_bold(null), $result_obj->test_profile->get_title() . ' ', $result_obj->get_arguments_description());
pts_arrays::unique_push($unique_tests, $result_obj->test_profile->get_title());
if($result_obj->test_profile->get_identifier() != null)
{
$table[] = array(pts_client::cli_just_bold(null), $result_obj->test_profile->get_title() . ' ', $result_obj->get_arguments_description());
pts_arrays::unique_push($unique_tests, $result_obj->test_profile->get_title());
}
}
echo pts_user_io::display_text_table($table) . PHP_EOL;
echo ' ' . pts_client::cli_just_bold(count($table) . ' Tests / ' . count($unique_tests) . ' Unique Tests') . PHP_EOL;
@@ -323,7 +326,7 @@ class info implements pts_option_interface
$test_titles = array();
foreach($o->get_result_objects() as $result_object)
{
if($result_object->test_profile->get_display_format() == 'BAR_GRAPH')
if($result_object->test_profile->get_display_format() == 'BAR_GRAPH' && $result_object->test_profile->get_identifier() != null)
{
$test_titles[] = $result_object->test_profile->get_title();
}

8
pts-core/objects/client/pts_test_run_manager.php
View File

@@ -1884,13 +1884,15 @@ class pts_test_run_manager
if($a_comp == $b_comp)
{
// So it's the same test being compared... try to sort in ascending order (such that 800 x 600 resolution comes before 1024 x 768), below way is an attempt to recognize such in weird manner
if(strlen($a->get_arguments_description()) == strlen($b->get_arguments_description()))
$ac = $a->get_arguments_description() != null ? $a->get_arguments_description() : '';
$bc = $b->get_arguments_description() != null ? $b->get_arguments_description() : '';
if(strlen($ac) == strlen($bc))
{
return strcmp($a->get_arguments_description(), $b->get_arguments_description());
return strcmp($ac, $bc);
}
else
{
return strcmp(strlen($a->get_arguments_description()), strlen($b->get_arguments_description()));
return strcmp(strlen($ac), strlen($bc));
}
}

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', 'MPI_ABORT was invoked', 'mpirun was unable to launch', 'error adding symbols:') 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', 'mpirun was unable to launch', 'error adding symbols:', 'not set and cannot find', 'please set JAVA', '/usr/bin/which: no ') as $error_string)
{
$lf = $log_file;
if(($e = strripos($lf, $error_string)) !== false)