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
15 changes: 0 additions & 15 deletions src/coreclr/tools/r2rtest/BuildFolderSet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ public bool Compile()

Stopwatch stopwatch = Stopwatch.StartNew();

ResolveTestExclusions();

var compilationsToRun = new List<ProcessInfo>();

foreach (BuildFolder folder in FoldersToBuild)
Expand Down Expand Up @@ -549,19 +547,6 @@ public bool Build()
return success;
}

private void ResolveTestExclusions()
{
TestExclusionMap exclusions = TestExclusionMap.Create(_options);
foreach (BuildFolder folder in _buildFolders)
{
if (exclusions.TryGetIssue(folder.InputFolder, out string issueID))
{
folder.IssueID = issueID;
continue;
}
}
}

private void AddBuildFolderExecutions(List<ProcessInfo> executionsToRun, BuildFolder folder, int iterations)
{
foreach (ProcessInfo[][] execution in folder.Executions)
Expand Down
8 changes: 0 additions & 8 deletions src/coreclr/tools/r2rtest/CommandLineOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ void CreateCommand(string name, string description, Option[] options, Func<Build
Crossgen2Parallelism,
Crossgen2JitPath,
ReferencePath,
IssuesPath,
CompilationTimeoutMinutes,
ExecutionTimeoutMinutes,
R2RDumpPath,
Expand Down Expand Up @@ -95,7 +94,6 @@ void CreateCommand(string name, string description, Option[] options, Func<Build
Crossgen2Parallelism,
Crossgen2JitPath,
ReferencePath,
IssuesPath,
CompilationTimeoutMinutes,
ExecutionTimeoutMinutes,
R2RDumpPath,
Expand Down Expand Up @@ -125,7 +123,6 @@ void CreateCommand(string name, string description, Option[] options, Func<Build
LargeBubble,
Composite,
ReferencePath,
IssuesPath,
CompilationTimeoutMinutes,
R2RDumpPath,
MeasurePerf,
Expand Down Expand Up @@ -259,9 +256,6 @@ void CreateCommand(string name, string description, Option[] options, Func<Build
public Option<FileInfo> Crossgen2JitPath { get; } =
new("--crossgen2-jitpath") { Description = "Jit path to use for crossgen2" };

public Option<FileInfo[]> IssuesPath { get; } =
new("--issues-path", "-ip") { Description = "Path to issues.targets", Arity = ArgumentArity.ZeroOrMore };

public Option<int> CompilationTimeoutMinutes { get; } =
new("--compilation-timeout-minutes", "-ct") { Description = "Compilation timeout (minutes)" };

Expand Down Expand Up @@ -337,7 +331,6 @@ public BuildOptions(R2RTestRootCommand cmd, ParseResult res)
CompilationTimeoutMinutes = res.GetValue(cmd.CompilationTimeoutMinutes);
ExecutionTimeoutMinutes = res.GetValue(cmd.ExecutionTimeoutMinutes);
ReferencePath = res.GetValue(cmd.ReferencePath);
IssuesPath = res.GetValue(cmd.IssuesPath);
R2RDumpPath = res.GetValue(cmd.R2RDumpPath);
AspNetPath = res.GetValue(cmd.AspNetPath);
MeasurePerf = res.GetValue(cmd.MeasurePerf);
Expand Down Expand Up @@ -377,7 +370,6 @@ public BuildOptions(R2RTestRootCommand cmd, ParseResult res)
public int CompilationTimeoutMinutes { get; }
public int ExecutionTimeoutMinutes { get; }
public DirectoryInfo[] ReferencePath { get; }
public FileInfo[] IssuesPath { get; }
public FileInfo R2RDumpPath { get; }
public DirectoryInfo AspNetPath { get; }
public bool MeasurePerf { get; }
Expand Down
229 changes: 0 additions & 229 deletions src/coreclr/tools/r2rtest/TestExclusion.cs

This file was deleted.

56 changes: 0 additions & 56 deletions src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs

This file was deleted.

19 changes: 0 additions & 19 deletions src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj

This file was deleted.

1 change: 0 additions & 1 deletion src/tests/Common/CLRTest.Execute.Bash.targets
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,6 @@ $(IlasmRoundTripBashScript)
$(SuperPMICollectionBashScript)
# Allow test environment variables or precommands to override the ExePath
ExePath=$(InputAssemblyName)
export TestExclusionListPath=$CORE_ROOT/TestExclusionList.txt
$(BashEnvironmentVariables)
# PreCommands
$(CLRTestBashPreCommands)
Expand Down
Loading
Loading