the CanBenchmarkGivenCoreClrMyGetBuild should pass on Unix too, #700 #…

…702
dotnet · Apr 5, 2018 · ca95871 · ca95871
1 parent ff97f17
commit ca95871
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/BenchmarkDotNet/Toolchains/CustomCoreClr/CustomCoreClrToolchain.cs b/src/BenchmarkDotNet/Toolchains/CustomCoreClr/CustomCoreClrToolchain.cs
@@ -159,7 +159,7 @@ public CustomCoreClrToolchainBuilder TargetFrameworkMoniker(string targetFramewo
         /// <param name="customDotNetCliPath">if not provided, the one from PATH will be used</param>
         public CustomCoreClrToolchainBuilder DotNetCli(string customDotNetCliPath)
         {
-            if (!String.IsNullOrEmpty(customDotNetCliPath) && !File.Exists(customDotNetCliPath))
+            if (!string.IsNullOrEmpty(customDotNetCliPath) && !File.Exists(customDotNetCliPath))
                 throw new FileNotFoundException("Given file does not exist", customDotNetCliPath);
 
             this.customDotNetCliPath = customDotNetCliPath;

diff --git a/tests/BenchmarkDotNet.IntegrationTests/CustomCoreClrToolchainTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CustomCoreClrToolchainTests.cs
@@ -2,7 +2,6 @@
 using BenchmarkDotNet.IntegrationTests.Xunit;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Toolchains.CustomCoreClr;
-using Xunit;
 using Xunit.Abstractions;
 // ReSharper disable InconsistentNaming we use crazy names for the types to include the  version numbers
 
@@ -33,11 +32,7 @@ public class Check_4_6_26328_01_CoreFxVersion : CheckCoreClrAndCoreFxVersions
             public Check_4_6_26328_01_CoreFxVersion() : base(expectedCoreFxVersion: "4.6.26328.01") { }
         }
 
-#if NETCOREAPP2_1
-        [FactWindowsOnly("It does not work for non-Windows OSes, where CoreFx version must be provided")]
-#else
-        [Fact(Skip = WeRunTheseTestsForNetCoreOnlyBecauseTheyTakeALotOfTime)]
-#endif
+        [FactDotNetCoreOnly(skipReason: WeRunTheseTestsForNetCoreOnlyBecauseTheyTakeALotOfTime)]
         public void CanBenchmarkGivenCoreClrMyGetBuild()
         {
             var config = ManualConfig.CreateEmpty()