Skip to content

[xharness] Fix how .NET projects are ignored. #9168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 2 commits into from
Jul 24, 2020
Merged

[xharness] Fix how .NET projects are ignored. #9168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a40678
[xharness] Fix how .NET projects are ignored.
rolfbjarne Jul 22, 2020
2e40166
Fix compile error.
rolfbjarne Jul 24, 2020
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
4 changes: 3 additions & 1 deletion tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,17 @@ public async Task<IEnumerable<ITestTask>> CreateAsync (Jenkins jenkins, IProcess
foreach (var config in configurations) {
foreach (var pair in ps) {
MSBuildTask derived;
var configIgnored = pair.Item3;
if (project.IsDotNetProject) {
derived = new DotNetBuildTask (jenkins: jenkins, testProject: project, processManager: processManager);
configIgnored |= !jenkins.IncludeDotNet;
} else {
derived = new MSBuildTask (jenkins: jenkins, testProject: project, processManager: processManager);
}
derived.ProjectConfiguration = config;
derived.ProjectPlatform = "iPhoneSimulator";
derived.Platform = pair.Item2;
derived.Ignored = pair.Item3;
derived.Ignored = configIgnored;
derived.TestName = project.Name;
derived.Dependency = project.Dependency;
derived.CloneTestProject (jenkins.MainLog, processManager, pair.Item1);
Expand Down
1 change: 1 addition & 0 deletions tests/xharness/Jenkins/TestVariationsFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ public IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<MSBuil
MSBuildTask build;
if (clone.IsDotNetProject) {
build = new DotNetBuildTask (jenkins: jenkins, testProject: clone, processManager: processManager);
ignored |= !jenkins.IncludeDotNet;
} else {
build = new MSBuildTask (jenkins: jenkins, testProject: clone, processManager: processManager);
}
Expand Down