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
19 changes: 1 addition & 18 deletions app/Http/Submission/Handlers/BazelJSONHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
use App\Services\ProjectService;
use App\Utils\SubmissionUtils;
use App\Utils\TestCreator;
use CDash\Database;
use CDash\Model\Build;
use CDash\Model\BuildConfigure;
use CDash\Model\BuildError;
use CDash\Model\BuildErrorFilter;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
Expand Down Expand Up @@ -57,7 +55,6 @@ class BazelJSONHandler extends AbstractSubmissionHandler
private array $TestsOutput = [];
private string $TestName = '';
private bool $ParseConfigure = true;
private ?BuildErrorFilter $BuildErrorFilter = null;

public function __construct(Build $build)
{
Expand Down Expand Up @@ -755,21 +752,7 @@ public function getBuild(): Build

private function RecordError($build_error, $type, $subproject_name): void
{
$text_with_context = $build_error->Text . $build_error->PostContext;

if ($this->BuildErrorFilter === null) {
$this->BuildErrorFilter = new BuildErrorFilter($this->GetProject());
$this->BuildErrorFilter->Fill();
}

if ($type === 0) {
$skip_error = $this->BuildErrorFilter->FilterError($text_with_context);
} else {
$skip_error = $this->BuildErrorFilter->FilterWarning($text_with_context);
}
if (!$skip_error) {
$this->BuildErrors[$subproject_name][] = $build_error;
}
$this->BuildErrors[$subproject_name][] = $build_error;
}

/**
Expand Down
22 changes: 0 additions & 22 deletions app/Http/Submission/Handlers/BuildHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
use CDash\Messaging\Topic\TopicCollection;
use CDash\Model\Build;
use CDash\Model\BuildError;
use CDash\Model\BuildErrorFilter;
use CDash\Model\BuildFailure;
use CDash\Model\BuildGroup;
use CDash\Model\Label;
Expand Down Expand Up @@ -71,7 +70,6 @@ class BuildHandler extends AbstractXmlHandler implements ActionableBuildInterfac
private string $PullRequest = '';
private ?string $SourceDirectory = null;
private ?string $BinaryDirectory = null;
private ?BuildErrorFilter $BuildErrorFilter = null;
protected static ?string $schema_file = '/app/Validators/Schemas/Build.xsd';

/**
Expand Down Expand Up @@ -431,26 +429,6 @@ public function endElement($parser, $name): void
}
}
} elseif ($name === 'WARNING' || $name === 'ERROR' || $name === 'FAILURE') {
$skip_error = false;
foreach (['StdOutput', 'StdError', 'Text'] as $field) {
if (isset($this->Error->$field)) {
if ($this->BuildErrorFilter === null) {
$this->BuildErrorFilter = new BuildErrorFilter($this->GetProject());
$this->BuildErrorFilter->Fill();
}

if ($this->Error->Type === 1) {
$skip_error = $this->BuildErrorFilter->FilterWarning($this->Error->$field);
} elseif ($this->Error->Type === 0) {
$skip_error = $this->BuildErrorFilter->FilterError($this->Error->$field);
}
}
}
if ($skip_error) {
unset($this->Error);
return;
}

$threshold = config('cdash.large_text_limit');
if ($threshold > 0) {
$chunk_size = $threshold / 2;
Expand Down
125 changes: 0 additions & 125 deletions app/cdash/app/Model/BuildErrorFilter.php

This file was deleted.

16 changes: 0 additions & 16 deletions app/cdash/app/Model/Project.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ class Project
public $AutoremoveTimeframe = 0;
public int $AutoremoveMaxBuilds = 300;
public $UploadQuota = 0;
public $WarningsFilter = '';
public $ErrorsFilter = '';
public ?string $LdapFilter = null;
public ?string $Banner = null;
private Database $PDO;
Expand Down Expand Up @@ -149,12 +147,6 @@ public function Save(): bool
$project->save();
$this->Id = $project->id;

$buildErrorFilter = new BuildErrorFilter($this);
$buildErrorFilter->Fill();
if ($buildErrorFilter->GetErrorsFilter() != $this->ErrorsFilter
|| $buildErrorFilter->GetWarningsFilter() != $this->WarningsFilter) {
return $buildErrorFilter->AddOrUpdateFilters($this->WarningsFilter, $this->ErrorsFilter);
}
return true;
}

Expand Down Expand Up @@ -233,14 +225,6 @@ public function Fill(): void
$this->LdapFilter = $project->ldapfilter;
}

// Check if we have filters
$build_filters = DB::select('SELECT * FROM build_filters WHERE projectid=?', [(int) $this->Id]);

if (count($build_filters) > 0) {
$this->WarningsFilter = $build_filters[0]->warnings;
$this->ErrorsFilter = $build_filters[0]->errors;
}

$this->Filled = true;
}

Expand Down
6 changes: 0 additions & 6 deletions app/cdash/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ add_php_test(passwordcomplexity)

add_legacy_unit_test(/CDash/Model/Build)

add_legacy_unit_test(/CDash/Model/BuildErrorFilter)

add_legacy_unit_test(/CDash/Model/Repository)

###################################################################################################
Expand Down Expand Up @@ -457,9 +455,6 @@ set_tests_properties(dynamicanalysisdefectlongtype PROPERTIES DEPENDS /CDash/Xml
add_php_test(configureappend)
set_tests_properties(configureappend PROPERTIES DEPENDS /CDash/XmlHandler/UpdateHandler)

add_php_test(filterbuilderrors)
set_tests_properties(filterbuilderrors PROPERTIES DEPENDS /CDash/XmlHandler/UpdateHandler)

add_php_test(buildproperties)
set_tests_properties(buildproperties PROPERTIES DEPENDS /CDash/XmlHandler/UpdateHandler)

Expand Down Expand Up @@ -503,7 +498,6 @@ set_property(TEST install_2 APPEND PROPERTY DEPENDS
dynamicanalysislogs
dynamicanalysisdefectlongtype
configureappend
filterbuilderrors
buildproperties
issuecreation
junithandler
Expand Down
63 changes: 0 additions & 63 deletions app/cdash/tests/case/CDash/Model/BuildErrorFilterTest.php

This file was deleted.

2 changes: 0 additions & 2 deletions app/cdash/tests/kwtest/kw_web_tester.php
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,6 @@ public function createProject($input_settings, $update = false,
'TestTimeStd' => 4,
'TestTimeStdThreshold' => 1,
'UploadQuota' => 1073741824,
'WarningsFilter' => '',
'ErrorsFilter' => '',
];
}

Expand Down
Loading