[Apple mobile] Use merged runners for runtime tests

eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml

@@ -19,8 +19,7 @@ parameters:
   variables: {}
   pool: ''
   dependsOn: []
-  compileOnHelix: false
-  interpreter: false
+  extraHelixArguments: ''
   buildAllTestsAsStandalone: false
   #arcade-specific parameters
   condition: always()
@@ -84,56 +83,41 @@ steps:
           env:
             __MonoToolPrefix: aarch64-linux-gnu-
 
-  # Checks the value of the compileOnHelix parameter
-  # and if set invokes libraries pipeline for AOT on Helix
-  - ${{ if eq(parameters.compileOnHelix, 'true') }}:
-    - template: /eng/pipelines/libraries/helix.yml
-      parameters:
-        osGroup: ${{ parameters.osGroup }}
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        archType: ${{ parameters.archType }}
-        targetRid: ${{ parameters.targetRid }}
-        buildConfig: ${{ parameters.buildConfig }}
-        interpreter: ${{ parameters.interpreter }}
-        testRunNamePrefixSuffix: ${{ parameters.testRunNamePrefixSuffix }}
-        extraHelixArguments: ${{ parameters.extraHelixArguments }}
-        helixQueues: ${{ parameters.helixQueues }}
-        creator: ${{ parameters.creator }}
-  - ${{ else }}:
-    - template: /eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
-      parameters:
-        displayName: Send tests to Helix
-        buildConfig: $(buildConfigUpper)
-        archType: ${{ parameters.archType }}
-        osGroup: ${{ parameters.osGroup }}
-        osSubgroup: ${{ parameters.osSubgroup}}
-        coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
-        shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        runtimeVariant: ${{ parameters.runtimeVariant }}
+  - template: /eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
+    parameters:
+      displayName: Send tests to Helix
+      buildConfig: $(buildConfigUpper)
+      archType: ${{ parameters.archType }}
+      osGroup: ${{ parameters.osGroup }}
+      osSubgroup: ${{ parameters.osSubgroup}}
+      coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
+      shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+      runtimeFlavor: ${{ parameters.runtimeFlavor }}
+      runtimeVariant: ${{ parameters.runtimeVariant }}
 
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          # Access token variable for internal project from the
-          # DotNet-HelixApi-Access variable group
-          helixAccessToken: $(HelixApiAccessToken)
-        ${{ else }}:
-          creator: $(Build.DefinitionName)
+      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        # Access token variable for internal project from the
+        # DotNet-HelixApi-Access variable group
+        helixAccessToken: $(HelixApiAccessToken)
+      ${{ else }}:
+        creator: $(Build.DefinitionName)
 
-        helixBuild: $(Build.BuildNumber)
-        helixSource: $(_HelixSource)
-        ${{ if ne(parameters.readyToRun, true) }}:
-          helixType: 'test/functional/cli/'
+      helixBuild: $(Build.BuildNumber)
+      helixSource: $(_HelixSource)
+      ${{ if ne(parameters.readyToRun, true) }}:
+        helixType: 'test/functional/cli/'
 
-        helixQueues: ${{ parameters.helixQueues }}
-        # This tests whether an array is empty
-        ${{ if eq(join('', parameters.helixQueues), '') }}:
-          condition: false
-        publishTestResults: true
-        timeoutPerTestInMinutes: $(timeoutPerTestInMinutes)
-        timeoutPerTestCollectionInMinutes: $(timeoutPerTestCollectionInMinutes)
-        runCrossGen2: ${{ eq(parameters.readyToRun, true) }}
-        compositeBuildMode: ${{ parameters.compositeBuildMode }}
-        runInUnloadableContext: ${{ parameters.runInUnloadableContext }}
-        nativeAotTest: ${{ parameters.nativeAotTest }}
-        helixProjectArguments: '$(Build.SourcesDirectory)/src/tests/Common/helixpublishwitharcade.proj'
-        scenarios: ${{ parameters.scenarios }}
+      helixQueues: ${{ parameters.helixQueues }}
+      # This tests whether an array is empty
+      ${{ if eq(join('', parameters.helixQueues), '') }}:
+        condition: false
+      publishTestResults: true
+      timeoutPerTestInMinutes: $(timeoutPerTestInMinutes)
+      timeoutPerTestCollectionInMinutes: $(timeoutPerTestCollectionInMinutes)
+      runCrossGen2: ${{ eq(parameters.readyToRun, true) }}
+      compositeBuildMode: ${{ parameters.compositeBuildMode }}
+      runInUnloadableContext: ${{ parameters.runInUnloadableContext }}
+      nativeAotTest: ${{ parameters.nativeAotTest }}
+      helixProjectArguments: '$(Build.SourcesDirectory)/src/tests/Common/helixpublishwitharcade.proj'
+      extraHelixArguments: ${{ parameters.extraHelixArguments }}
+      scenarios: ${{ parameters.scenarios }}

eng/pipelines/common/templates/runtimes/send-to-helix-step.yml

@@ -19,6 +19,7 @@ parameters:
   runCrossGen2: ''
   compositeBuildMode: false
   helixProjectArguments: ''
+  extraHelixArguments: ''
   runInUnloadableContext: ''
   tieringTest: ''
   hotColdSplitting: ''
@@ -38,7 +39,7 @@ steps:
 - template: send-to-helix-inner-step.yml
   parameters:
     osGroup: ${{ parameters.osGroup }}
-    sendParams: ${{ parameters.helixProjectArguments }} ${{ parameters.msbuildParallelism }} /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog /p:TargetArchitecture=${{ parameters.archType }} /p:TargetOS=${{ parameters.osGroup }} /p:TargetOSSubgroup=${{ parameters.osSubgroup }} /p:Configuration=${{ parameters.buildConfig }}
+    sendParams: ${{ parameters.helixProjectArguments }} ${{ parameters.msbuildParallelism }} /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog /p:TargetArchitecture=${{ parameters.archType }} /p:TargetOS=${{ parameters.osGroup }} /p:TargetOSSubgroup=${{ parameters.osSubgroup }} /p:Configuration=${{ parameters.buildConfig }} ${{ parameters.extraHelixArguments }}
     condition: and(succeeded(), ${{ parameters.condition }})
     shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
     displayName: ${{ parameters.displayName }}

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml

@@ -91,9 +91,8 @@ jobs:
         - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
           parameters:
             creator: dotnet-bot
+            testBuildArgs: /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildTestsOnHelix=true
             compileOnHelix: true
-            interpreter: true
-            testBuildArgs: /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildTestsOnHelix=true
             testRunNamePrefixSuffix: Mono_$(_BuildConfig)
             extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
 

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml

@@ -89,9 +89,8 @@ jobs:
         - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
           parameters:
             creator: dotnet-bot
+            testBuildArgs: /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildTestsOnHelix=true
             compileOnHelix: true
-            interpreter: true
-            testBuildArgs: /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildTestsOnHelix=true
             testRunNamePrefixSuffix: Mono_$(_BuildConfig)
             extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
 

eng/testing/tests.ioslike.targets

@@ -28,6 +28,7 @@
 
     <_AppleBuildCommand Condition="'$(IncludesTestRunner)' == 'true'">apple test</_AppleBuildCommand>
     <_AppleBuildCommand Condition="'$(IncludesTestRunner)' != 'true'">apple run</_AppleBuildCommand>
+
     <_AppleExpectedExitCode Condition="'$(ExpectedExitCode)' != ''">--expected-exit-code $(ExpectedExitCode)</_AppleExpectedExitCode>
     <_AfterBuildCommands>
       mv $XHARNESS_OUT/AOTBuild.binlog &quot;$HELIX_WORKITEM_UPLOAD_ROOT&quot;
@@ -178,7 +179,7 @@
       <HybridGlobalization>true</HybridGlobalization>
       <IncludesTestRunner Condition="'$(IncludesTestRunner)' == ''">true</IncludesTestRunner>
       <Optimized Condition="'$(Configuration)' == 'Release'">true</Optimized>
-      <MainLibraryFileName Condition="'$(MainLibraryFileName)' == '' and '$(IsRuntimeTests)' != 'true' and '$(IncludesTestRunner)' == 'true'">AppleTestRunner.dll</MainLibraryFileName>
+      <MainLibraryFileName Condition="'$(MainLibraryFileName)' == '' and '$(IncludesTestRunner)' == 'true'">AppleTestRunner.dll</MainLibraryFileName>
 
       <AppleBuildDir>$(PublishDir)</AppleBuildDir>
       <AppleBundleDir>$(BundleDir)</AppleBundleDir>

src/mono/msbuild/apple/build/AppleBuild.props

@@ -49,4 +49,4 @@
   <Import Condition="'$(UseNativeAOTRuntime)' != 'true' and '$(UseMonoRuntime)' != 'false'" Project="$(_CommonTargetsDir)CommonMobileBuild.props" />
   <Import Condition="'$(UseNativeAOTRuntime)' != 'true' and '$(UseMonoRuntime)' != 'false'" Project="$(_CommonTargetsDir)RuntimeComponentManifest.targets" />
   <Import Condition="'$(UseNativeAOTRuntime)' != 'true' and ('$(UseMonoRuntime)' != 'false' and '$(RunAOTCompilation)' == 'true')" Project="$(_CommonTargetsDir)MonoAOTCompiler.props" />
-</Project>
+</Project>

src/tests/Common/CoreCLRTestLibrary/PlatformDetection.cs

@@ -64,5 +64,6 @@ public static bool IsNonZeroLowerBoundArraySupported
         // These platforms have not had their infrastructure updated to support native test assets.
         public static bool PlatformDoesNotSupportNativeTestAssets =>
             OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS() || OperatingSystem.IsAndroid() || OperatingSystem.IsBrowser() || OperatingSystem.IsWasi();
+        public static bool IsAppleMobile => OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS() || OperatingSystem.IsMacCatalyst();
     }
 }

src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

@@ -259,7 +259,7 @@ private static void AddRunnerSource(SourceProductionContext context, ImmutableAr
         {
             if (targetOS?.ToLowerInvariant() is "ios" or "iossimulator" or "tvos" or "tvossimulator" or "maccatalyst" or "android" or "browser")
             {
-                context.AddSource("XHarnessRunner.g.cs", GenerateXHarnessTestRunner(methods, aliasMap, assemblyName));
+                context.AddSource("XHarnessRunner.g.cs", GenerateXHarnessTestRunner(methods, aliasMap, assemblyName, targetOS));
             }
             else
             {
@@ -431,7 +431,7 @@ private static string GenerateFullTestRunner(ImmutableArray<ITestInfo> testInfos
         return builder.GetCode();
     }
 
-    private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testInfos, ImmutableDictionary<string, string> aliasMap, string assemblyName)
+    private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testInfos, ImmutableDictionary<string, string> aliasMap, string assemblyName, string? targetOS)
     {
         // For simplicity, we'll use top-level statements for the generated Main method.
         CodeBuilder builder = new();
@@ -440,6 +440,18 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
         builder.AppendLine("XUnitWrapperLibrary.TestSummary summary;");
         builder.AppendLine("System.Diagnostics.Stopwatch stopwatch;");
         builder.AppendLine("XUnitWrapperLibrary.TestOutputRecorder outputRecorder;");
+        if (targetOS?.ToLowerInvariant() is "ios" or "iossimulator" or "tvos" or "tvossimulator" or "maccatalyst")
+        {
+            builder.AppendLine("string documentsPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);");
+            builder.AppendLine($@"string tempLogPath = System.IO.Path.Combine(documentsPath, ""{assemblyName}.templog.xml"");");
+            builder.AppendLine($@"string testStatsPath = System.IO.Path.Combine(documentsPath, ""{assemblyName}.testStats.csv"");");
+        }
+        else
+        {
+            builder.AppendLine($@"string tempLogPath = ""{assemblyName}.templog.xml"";");
+            builder.AppendLine($@"string testStatsPath = ""{assemblyName}.testStats.csv"";");
+        }
+
         builder.AppendLine();
 
         builder.AppendLine("try");
@@ -468,16 +480,16 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
 
         using (builder.NewBracesScope())
         {
-            builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.tempLog.xml""))");
+            builder.AppendLine("if (System.IO.File.Exists(tempLogPath))");
             using (builder.NewBracesScope())
             {
-                builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.tempLog.xml"");");
+                builder.AppendLine("System.IO.File.Delete(tempLogPath);");
             }
 
-            builder.AppendLine($@"if (System.IO.File.Exists(""{assemblyName}.testStats.csv""))");
+            builder.AppendLine("if (System.IO.File.Exists(testStatsPath))");
             using (builder.NewBracesScope())
             {
-                builder.AppendLine($@"System.IO.File.Delete(""{assemblyName}.testStats.csv"");");
+                builder.AppendLine("System.IO.File.Delete(testStatsPath);");
             }
             builder.AppendLine();
 
@@ -495,8 +507,8 @@ private static string GenerateXHarnessTestRunner(ImmutableArray<ITestInfo> testI
             builder.AppendLine("Initialize();");
 
             // Open the stream writer for the temp log.
-            builder.AppendLine($@"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(""{assemblyName}.templog.xml""))");
-            builder.AppendLine($@"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(""{assemblyName}.testStats.csv""))");
+            builder.AppendLine($"using (System.IO.StreamWriter tempLogSw = System.IO.File.AppendText(tempLogPath))");
+            builder.AppendLine($"using (System.IO.StreamWriter statsCsvSw = System.IO.File.AppendText(testStatsPath))");
             CodeBuilder testExecutorBuilder = new();
 
             using (builder.NewBracesScope())