Merge pull request #58111 from dotnet/merges/main-to-features/rename_…

…ui_rework Merge main to features/rename_ui_rework
dotnet · Dec 4, 2021 · ab0af20 · ab0af20
2 parents 1c07b7f + 0b2c30d
commit ab0af20
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
@@ -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;

diff --git a/src/Compilers/Test/Core/Assert/ConditionalFactAttribute.cs b/src/Compilers/Test/Core/Assert/ConditionalFactAttribute.cs
@@ -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;