Skip to content
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

Merge main to features/rename_ui_rework #58111

Merged
merged 1 commit into from
Dec 4, 2021
Merged

Merge main to features/rename_ui_rework #58111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,9 @@ public void ModuleManifest()
Assert.Equal("blah", args.Win32Manifest);
}

[Fact]
// The following test is failing in the Linux Debug test leg of CI.
// This issus is being tracked by https://github.com/dotnet/roslyn/issues/58077
[ConditionalFact(typeof(WindowsOrMacOSOnly))]
public void ArgumentParsing()
{
var sdkDirectory = SdkDirectory;
Expand Down
6 changes: 6 additions & 0 deletions src/Compilers/Test/Core/Assert/ConditionalFactAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,12 @@ public class UnixLikeOnly : ExecutionCondition
public override string SkipReason => "Test not supported on Windows";
}

public class WindowsOrMacOSOnly : ExecutionCondition
{
public override bool ShouldSkip => PathUtilities.IsUnixLikePlatform && !ExecutionConditionUtil.IsMacOS;
public override string SkipReason => "Test not supported on Linux";
}

public class WindowsOrLinuxOnly : ExecutionCondition
{
public override bool ShouldSkip => ExecutionConditionUtil.IsMacOS;
Expand Down