Skip to content

Commit ab0af20

Browse files
authored
Merge pull request #58111 from dotnet/merges/main-to-features/rename_ui_rework
Merge main to features/rename_ui_rework
2 parents 1c07b7f + 0b2c30d commit ab0af20

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,9 @@ public void ModuleManifest()
14101410
Assert.Equal("blah", args.Win32Manifest);
14111411
}
14121412

1413-
[Fact]
1413+
// The following test is failing in the Linux Debug test leg of CI.
1414+
// This issus is being tracked by https://github.com/dotnet/roslyn/issues/58077
1415+
[ConditionalFact(typeof(WindowsOrMacOSOnly))]
14141416
public void ArgumentParsing()
14151417
{
14161418
var sdkDirectory = SdkDirectory;

src/Compilers/Test/Core/Assert/ConditionalFactAttribute.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,12 @@ public class UnixLikeOnly : ExecutionCondition
300300
public override string SkipReason => "Test not supported on Windows";
301301
}
302302

303+
public class WindowsOrMacOSOnly : ExecutionCondition
304+
{
305+
public override bool ShouldSkip => PathUtilities.IsUnixLikePlatform && !ExecutionConditionUtil.IsMacOS;
306+
public override string SkipReason => "Test not supported on Linux";
307+
}
308+
303309
public class WindowsOrLinuxOnly : ExecutionCondition
304310
{
305311
public override bool ShouldSkip => ExecutionConditionUtil.IsMacOS;

0 commit comments

Comments
 (0)