Skip to content

Commit

Permalink
[I-Build] Fix test result summary configuration label break-up
Browse files Browse the repository at this point in the history
The underscore in 'x86_64' is still part of the first part, the
'job-name' part, of the configuration label.
Therefore the only the first underscore after x86_64 should be
considered as delimiter.

Additionally improve dynamic adaption of listing of log files.

Fixes #2494
  • Loading branch information
HannesWell committed Oct 29, 2024
1 parent 01d725f commit fe1647a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,9 @@

<?php
listLogs("$testresults/consolelogs");
listDetailedLogs($testresults,$expectedTestConfigs[0]);
listDetailedLogs($testresults,$expectedTestConfigs[1]);
listDetailedLogs($testresults,$expectedTestConfigs[2]);
listDetailedLogs($testresults,$expectedTestConfigs[3]);
listDetailedLogs($testresults,$expectedTestConfigs[4]);
listDetailedLogs($testresults,$expectedTestConfigs[5]);
listDetailedLogs($testresults,$expectedTestConfigs[6]);
foreach ($expectedTestConfigs as $expectedTestConfig) {
listDetailedLogs($testresults, $expectedTestConfig);
}
?>

</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function fileSizeForDisplay($filename) {
*/
function computeDisplayConfig($config) {
$lastUnderscore = strrpos ($config, "_");
$firstUnderscore = strpos ($config, "_");
$firstUnderscore = strpos ($config, "_", strpos($config, "x86_64") + 6);
$platformLength=$lastUnderscore - $firstUnderscore - 1;
//echo "<br/>DEBUG: config: $config firstUnderscore: $firstUnderscore lastUnderscore: $lastUnderscore lastMinusFirst: $platformLength"
$jobname = substr($config,0,$firstUnderscore);
Expand All @@ -293,7 +293,7 @@ function computeDisplayConfig($config) {
which is 'jobname' on Hudson.
*/
function jobname($config) {
$firstUnderscore = strpos ($config, "_");
$firstUnderscore = strpos ($config, "_", strpos($config, "x86_64") + 6);
$jobname = substr($config,0,$firstUnderscore);
return $jobname;
}
Expand Down

0 comments on commit fe1647a

Please sign in to comment.