Split LargeAddressAwareTests.

Ignore NoHangs test on full Framework on non-x86.

Author: timcassell

tests/BenchmarkDotNet.IntegrationTests/FailingProcessSpawnTests.cs

@@ -23,6 +23,12 @@ public void NoHangs()
                 _ => Platform.X64
             };
 
+            if (wrongPlatform == Platform.X64 && RuntimeInformation.IsFullFramework)
+            {
+                // It seems full Framework on Arm ignores the platform and simply runs the native platform, causing this test to fail.
+                return;
+            }
+
             var invalidPlatformJob = Job.Dry.WithPlatform(wrongPlatform);
             var config = CreateSimpleConfig(job: invalidPlatformJob);
 

tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs

@@ -20,19 +20,14 @@ public class LargeAddressAwareTest
 
         public LargeAddressAwareTest(ITestOutputHelper outputHelper) => output = outputHelper;
 
-        [FactEnvSpecific("CLR is a valid job only on Windows", EnvRequirement.WindowsOnly)]
-        public void BenchmarkCanAllocateMoreThan2Gb()
+        [Fact]
+        public void BenchmarkCanAllocateMoreThan2Gb_Core()
         {
             var platform = RuntimeInformation.GetCurrentPlatform();
             var config = ManualConfig.CreateEmpty();
-            if (platform == Platform.X64 || platform == Platform.Arm64)
-            {
-                config.AddJob(Job.Dry.WithRuntime(CoreRuntime.Core80).WithPlatform(platform).WithId("Core"));
-            }
-            if (platform == Platform.X64 || platform == Platform.X86)
-            {
-                config.AddJob(Job.Dry.WithRuntime(ClrRuntime.Net462).WithPlatform(Platform.X86).WithGcServer(false).WithLargeAddressAware().WithId("Framework"));
-            }
+            // Running 32-bit benchmarks with .Net Core requires passing the path to 32-bit SDK,
+            // which makes this test more complex than it's worth in CI, so we only test 64-bit.
+            config.AddJob(Job.Dry.WithRuntime(CoreRuntime.Core80).WithPlatform(platform).WithId(platform.ToString()));
             config.AddColumnProvider(DefaultColumnProviders.Instance)
                   .AddLogger(new OutputLogger(output));
 
@@ -43,16 +38,37 @@ public void BenchmarkCanAllocateMoreThan2Gb()
                 .All(executeResult => executeResult.FoundExecutable)));
 
             Assert.True(summary.Reports.All(report => report.AllMeasurements.Any()));
+            Assert.True(summary.Reports.All(report => report.ExecuteResults.Any()));
+            Assert.Equal(1, summary.Reports.Count(report => report.BenchmarkCase.Job.Environment.Runtime is CoreRuntime));
 
-            Assert.True(summary.Reports
-                .Single(report => report.BenchmarkCase.Job.Environment.Runtime is ClrRuntime)
-                .ExecuteResults
-                .Any());
+            Assert.Contains(".NET 8.0", summary.AllRuntimes);
+        }
+
+        [FactEnvSpecific("Framework is only on Windows", EnvRequirement.WindowsOnly)]
+        public void BenchmarkCanAllocateMoreThan2Gb_Framework()
+        {
+            var platform = RuntimeInformation.GetCurrentPlatform();
+            var config = ManualConfig.CreateEmpty();
+            // Net481 officially only supports x86, x64, and Arm64.
+            config.AddJob(Job.Dry.WithRuntime(ClrRuntime.Net481).WithPlatform(platform).WithGcServer(false).WithLargeAddressAware().WithId(platform.ToString()));
+            int jobCount = 1;
+            if (platform == Platform.X64)
+            {
+                ++jobCount;
+                config.AddJob(Job.Dry.WithRuntime(ClrRuntime.Net462).WithPlatform(Platform.X86).WithGcServer(false).WithLargeAddressAware().WithId("X86"));
+            }
+            config.AddColumnProvider(DefaultColumnProviders.Instance)
+                  .AddLogger(new OutputLogger(output));
+
+            var summary = BenchmarkRunner.Run<NeedsMoreThan2GB>(config);
 
             Assert.True(summary.Reports
-                .Single(report => report.BenchmarkCase.Job.Environment.Runtime is CoreRuntime)
-                .ExecuteResults
-                .Any());
+                .All(report => report.ExecuteResults
+                .All(executeResult => executeResult.FoundExecutable)));
+
+            Assert.True(summary.Reports.All(report => report.AllMeasurements.Any()));
+            Assert.True(summary.Reports.All(report => report.ExecuteResults.Any()));
+            Assert.Equal(jobCount, summary.Reports.Count(report => report.BenchmarkCase.Job.Environment.Runtime is ClrRuntime));
 
             Assert.Contains(".NET Framework", summary.AllRuntimes);
             Assert.Contains(DotNetRuntimeHelper.GetExpectedDotNetCoreRuntimeName(), summary.AllRuntimes);