Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/Utils/TestDiffUtil.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ private static function computeDifferencesForType(Build $build, Build $previous_
// has changed since the previous build.
$newstatus_b2t_ids = [];

$previous_test_names = array_flip(array_column($previous_tests, 'name'));
foreach ($tests as $test) {
if (array_search($test['name'], array_column($previous_tests, 'name')) === false) {
if (!isset($previous_test_names[$test['name']])) {
// This test was found for the current build but not the previous build.
$num_positive++;
$newstatus_b2t_ids[] = $test['buildtestid'];
Expand All @@ -78,8 +79,9 @@ private static function computeDifferencesForType(Build $build, Build $previous_
Test::whereIn('id', $newstatus_b2t_ids)
->update(['newstatus' => 1]);

$test_names = array_flip(array_column($tests, 'name'));
foreach ($previous_tests as $previous_test) {
if (array_search($previous_test['name'], array_column($tests, 'name')) === false) {
if (!isset($test_names[$previous_test['name']])) {
// This test had status=$type in the previous build, but it doesn't any more.
$num_negative++;
}
Expand Down
4 changes: 2 additions & 2 deletions app/cdash/app/Model/Build.php
Original file line number Diff line number Diff line change
Expand Up @@ -1177,13 +1177,13 @@ public function ComputeTestTiming(): bool
$testtimestatusfailed = 0;

// Get the tests performed by the previous build.
$previous_tests = Test::where('buildid', $previousbuildid)->get();
$previous_tests = Test::where('buildid', $previousbuildid)->get()->keyBy('testname');

// Loop through the tests performed by this build.
$current_tests = Test::where('buildid', $this->Id)->get();
/** @var Test $current_test */
foreach ($current_tests as $current_test) {
$previous_test = $previous_tests->firstWhere('testname', $current_test->testname);
$previous_test = $previous_tests->get($current_test->testname);
if ($previous_test !== null) {
if ($current_test->status === 'passed') {
// if the current test passed
Expand Down
6 changes: 0 additions & 6 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -5841,12 +5841,6 @@ parameters:
count: 2
path: app/Utils/TestDiffUtil.php

-
rawMessage: 'Call to function array_search() requires parameter #3 to be set.'
identifier: function.strict
count: 2
path: app/Utils/TestDiffUtil.php

-
rawMessage: 'Only booleans are allowed in an if condition, stdClass|null given.'
identifier: if.condNotBoolean
Expand Down
Loading