Merged PR 33295: Re-enable R2R tests in source-build

Re-enables the R2R tests that were disabled by dotnet/installer#17118.
dotnet · Aug 21, 2023 · 6b37f3d · 6b37f3d
1 parent 4931c76
commit 6b37f3d
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs
@@ -34,8 +34,7 @@ public static IEnumerable<TestScenario> GetScenarios()
         {
             yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.Console,
                 // R2R is not supported on Mono (see https://github.com/dotnet/runtime/issues/88419#issuecomment-1623762676)
-                // Disable R2R tests due to https://github.com/dotnet/source-build/issues/3591
-                DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex);
+                DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex | (helper.IsMonoRuntime ? DotNetActions.None : DotNetActions.PublishR2R));
             yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.ClassLib, DotNetActions.Build | DotNetActions.Publish);
             yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit,    DotNetActions.Test);
             yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit,    DotNetActions.Test);