Split NativeAOT tests to use separate merged runners

src/libraries/sendtohelix-mobile.targets

@@ -27,6 +27,12 @@
     </XHarnessApkToTest>
   </ItemDefinitionGroup>
 
+  <ItemDefinitionGroup Condition="'$(TargetsAppleMobile)' == 'true' and '$(NativeAotTest)' == 'true'">
+    <XHarnessAppBundleToTest>
+      <ExpectedExitCode>100</ExpectedExitCode>
+    </XHarnessAppBundleToTest>
+  </ItemDefinitionGroup>
+
   <PropertyGroup Condition="'$(NeedsiOSSDK)' == 'true'">
     <NeedsDotNetSdk>true</NeedsDotNetSdk>
     <UseDotNetCliVersionFromGlobalJson>true</UseDotNetCliVersionFromGlobalJson>

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

@@ -314,6 +314,7 @@
       <AppleAppBuilderRuntime Condition="'$(AppleAppBuilderRuntime)' == '' and '$(UseNativeAOTRuntime)' == 'true'">NativeAOT</AppleAppBuilderRuntime>
       <AppleAppBuilderRuntime Condition="'$(AppleAppBuilderRuntime)' == '' and '$(UseMonoRuntime)' == 'false'">CoreCLR</AppleAppBuilderRuntime>
       <AppleAppBuilderRuntime Condition="'$(AppleAppBuilderRuntime)' == ''">MonoVM</AppleAppBuilderRuntime>
+      <MainLibraryFileName Condition="'$(UseNativeAOTRuntime)' == 'true'"></MainLibraryFileName>
     </PropertyGroup>
 
     <AppleAppBuilderTask

src/tests/Common/helixpublishwitharcade.proj

@@ -342,6 +342,7 @@
     <ItemGroup>
       <!-- Exclude WASM support files. They can interfere with our discovery process and create extra work items that don't work. -->
       <_MergedWrapperMarker Include="$(TestBinDir)**\*.MergedTestAssembly" Exclude="$(TestBinDir)**\supportFiles\*.MergedTestAssembly" />
+      <_MergedWrapperMarker Include="$(TestBinDir)**\*.MergedTestAssemblyForStress" Exclude="$(TestBinDir)**\supportFiles\*.MergedTestAssemblyForStress" />
 
       <_MergedWrapperMarker Update="@(_MergedWrapperMarker)">
         <TestExecutionScriptPath Condition="'$(TargetsMobile)' != 'true'">$([System.IO.Path]::ChangeExtension('%(Identity)', '.$(TestScriptExtension)'))</TestExecutionScriptPath>
@@ -549,28 +550,18 @@
       Outputs="%(_MergedWrapperMarker.FileName)"
       DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
 
-    <PropertyGroup>
+    <PropertyGroup Condition="'@(_MergedWrapperMarker)' != ''" >
       <_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
-      <_MergedWrapperName>%(_MergedWrapperMarker.FileName)</_MergedWrapperName>
+      <_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.MergedTestAssembly(ForStress)?\.\d+\.\d+$', ''))</_MergedWrapperName>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <XCodeSdk Condition="'$(TargetsiOS)' == 'true'">iphone</XCodeSdk>
-      <XCodeSdk Condition="'$(TargetsiOSSimulator)' == 'true'">iphonesimulator</XCodeSdk>
-      <XCodeSdk Condition="'$(TargetstvOS)' == 'true'">appletvos</XCodeSdk>
-      <XCodeSdk Condition="'$(TargetstvOSSimulator)' == 'true'">appletvsimulator</XCodeSdk>
-      <XCodeSdk Condition="'$(TargetsMacCatalyst)' == 'true'">maccatalyst</XCodeSdk>
-    </PropertyGroup>
-
-    <ItemGroup>
+     <ItemGroup Condition="'@(_MergedWrapperMarker)' != ''" >
       <_MergedPayloadGroups Include="$(_MergedWrapperName)" />
-    </ItemGroup>
-    <ItemGroup>
-      <_MergedPayloadFiles Include="$(_MergedWrapperDirectory)AppBundle/$(_MergedWrapperName)/$(Configuration)-$(XCodeSdk)/$(_MergedWrapperName).app/**" />
-      <_MergedPayloadFiles Update="@(_MergedPayloadFiles)">
+      <_MergedPayloadFiles Include="$(_MergedWrapperDirectory)AppBundle/**" />
+      <_MergedPayloadFiles Update="@(_MergedPayloadFiles)" Condition="'@(_MergedPayloadFiles)' != ''" >
         <!-- Never use [MSBuild]::MakeRelative here! We have some files containing Unicode characters in their %(FullPath) and
              MakeRelative function calls Escape function internally that replaces all the Unicode characters with %<xx>. -->
-        <FileRelativeToPayloadsRootDirectory>$([System.IO.Path]::GetRelativePath('$(_MergedWrapperDirectory)AppBundle/$(_MergedWrapperName)/$(Configuration)-$(XCodeSdk)', %(FullPath)))</FileRelativeToPayloadsRootDirectory>
+        <FileRelativeToPayloadsRootDirectory>$([System.IO.Path]::GetRelativePath('$(_MergedWrapperDirectory)AppBundle/', %(FullPath)))</FileRelativeToPayloadsRootDirectory>
       </_MergedPayloadFiles>
       <!-- Remove the placeholder test exclusion list here -->
       <_TestExclusionListPlaceholder Include="@(_MergedPayloadFiles)" Condition="$([System.String]::new('%(FileName)').EndsWith('TestExclusionList'))" />
@@ -591,7 +582,7 @@
 
     <PropertyGroup Condition="'@(_MergedWrapperMarker)' != ''" >
       <_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
-      <_MergedWrapperName>%(_MergedWrapperMarker.FileName)</_MergedWrapperName>
+      <_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.MergedTestAssembly(ForStress)?\.\d+\.\d+$', ''))</_MergedWrapperName>
     </PropertyGroup>
 
     <ItemGroup Condition="'@(_MergedWrapperMarker)' != ''" >

src/tests/build.proj

@@ -370,6 +370,7 @@
       <AllRunnableTestPaths Remove="$(XunitTestBinBase)\**\run-v8.sh" Condition="'$(TargetArchitecture)' == 'wasm'" />
       <AllRunnableTestPaths Remove="%(SkipTestDirsPaths.Identity)\**\*.$(TestScriptExtension)" />
       <MergedAssemblyMarkerPaths Include="$(XunitTestBinBase)\**\*.MergedTestAssembly"/>
+      <MergedAssemblyMarkerPaths Include="$(XunitTestBinBase)\**\*.MergedTestAssemblyForStress"/>
       <MergedAssemblyFolders Include="$([System.IO.Path]::GetDirectoryName('%(MergedAssemblyMarkerPaths.Identity)'))" />
       <MergedAssemblyParentFolders Include="$([System.IO.Path]::GetDirectoryName('%(MergedAssemblyFolders.Identity)'))" />
       <AllRunnableTestPaths Remove="%(MergedAssemblyParentFolders.Identity)\**\*.$(TestScriptExtension)" Condition="'@(MergedAssemblyParentFolders)' != ''" />

src/tests/nativeaot/Directory.Build.props

@@ -5,5 +5,11 @@
   <PropertyGroup>
     <!-- We expect trimming to be fully enabled in these tests -->
     <EnableAggressiveTrimming>true</EnableAggressiveTrimming>
+
+    <!--
+      Each of these tests is considered its own "merged runner" that contains merged-in tests.
+      This allows the tests to run on mobile platforms where process isolation is not supported.
+    -->
+    <HasMergedInTests>true</HasMergedInTests>
   </PropertyGroup>
 </Project>

src/tests/nativeaot/Directory.Build.targets

@@ -0,0 +1,13 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    Treat these tests as merged test runners.
+    Many of these NativeAOT tests need to be their own executables to validate specific features,
+    but we want to run them on mobile platforms as well.
+    However, mobile platforms don't support tests that require process isolation, so we can't use RequiresProcessIsolation.
+    Instead, we treat these tests as merged test runners themselves, so that they can run on mobile platforms.
+  -->
+  <Import Condition="'$(CLRTestKind)' != 'SharedLibrary'" Project="$(TestSourceDir)MergedTestRunner.targets" />
+
+  <!-- SDK Style projects auto-magically include this file. -->
+  <Import Project="..\Directory.Build.targets" />
+</Project>

src/tests/nativeaot/GenerateUnmanagedEntryPoints/GenerateUnmanagedEntryPoints.cs

@@ -4,52 +4,56 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Xunit;
 
 namespace GenerateUnmanagedEntryPoints
 {
-    unsafe class Program
+    unsafe class Tests : IDisposable
     {
         [UnmanagedCallersOnly(EntryPoint = "MainAssemblyMethod")]
         static void MainAssemblyMethod() => Console.WriteLine($"Hello from {nameof(MainAssemblyMethod)}");
 
-        static int Main()
+        private IntPtr programHandle;
+
+        public Tests()
         {
-            IntPtr methodAddress = IntPtr.Zero;
-            IntPtr programHandle = IntPtr.Zero;
-
             programHandle = NativeLibrary.GetMainProgramHandle();
-            if (programHandle == IntPtr.Zero)
-            {
-                return 1;
-            }
-
-            if (NativeLibrary.TryGetExport(programHandle, "MainAssemblyMethod", out methodAddress))
-            {
-                var MainAssemblyMethodPtr = (delegate* unmanaged <void>) methodAddress;
-                MainAssemblyMethodPtr();
-            }
-            else
-            {
-                return 2;
-            }
-
-            if (NativeLibrary.TryGetExport(programHandle, "ReferencedAssembly1Method", out methodAddress))
-            {
-                var ReferencedAssembly1MethodPtr = (delegate* unmanaged <void>) methodAddress;
-                ReferencedAssembly1MethodPtr();
-            }
-            else
-            {
-                return 3;
-            }
-
-            if (NativeLibrary.TryGetExport(programHandle, "ReferencedAssembly2Method", out methodAddress))
-            {
-                // must not be exposed from ReferencedAssembly2 assembly
-                return 4;
-            }
-
-            return 100;
+            Assert.NotEqual(IntPtr.Zero, programHandle);
+        }
+
+        [Fact]
+        public void ExportFromMainAssembly_IsExported()
+        {
+            IntPtr methodAddress = IntPtr.Zero;
+            bool found = NativeLibrary.TryGetExport(programHandle, "MainAssemblyMethod", out methodAddress);
+            Assert.True(found);
+            Assert.NotEqual(IntPtr.Zero, methodAddress);
+            var MainAssemblyMethodPtr = (delegate* unmanaged<void>)methodAddress;
+            MainAssemblyMethodPtr();
+        }
+
+        [Fact]
+        public void ExportFromUnmanagedEntryPointsAssembly_IsExported()
+        {
+            IntPtr methodAddress = IntPtr.Zero;
+            bool found = NativeLibrary.TryGetExport(programHandle, "ReferencedAssembly1Method", out methodAddress);
+            Assert.True(found);
+            Assert.NotEqual(IntPtr.Zero, methodAddress);
+            var ReferencedAssembly1MethodPtr = (delegate* unmanaged<void>)methodAddress;
+            ReferencedAssembly1MethodPtr();
+        }
+
+        [Fact]
+        public void ExportFromOtherAssembly_IsNotExported()
+        {
+            IntPtr methodAddress = IntPtr.Zero;
+            bool found = NativeLibrary.TryGetExport(programHandle, "ReferencedAssembly2Method", out methodAddress);
+            Assert.False(found);
+            Assert.Equal(IntPtr.Zero, methodAddress);
+        }
+
+        public void Dispose()
+        {
         }
     }
-}
+}

src/tests/nativeaot/GenerateUnmanagedEntryPoints/GenerateUnmanagedEntryPoints.csproj

@@ -8,8 +8,6 @@
       Disable for now.
     -->
     <DisableProjectBuild Condition="'$(EnableNativeSanitizers)' != ''">true</DisableProjectBuild>
-    <RequiresProcessIsolation>true</RequiresProcessIsolation>
-    <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,5 +20,4 @@
   <ItemGroup>
     <UnmanagedEntryPointsAssembly Include="ReferencedAssembly1" />
   </ItemGroup>
-
 </Project>

src/tests/nativeaot/GenerateUnmanagedEntryPoints/ReferencedAssembly1/ReferencedAssembly1.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <CLRTestKind>SharedLibrary</CLRTestKind>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 

src/tests/nativeaot/GenerateUnmanagedEntryPoints/ReferencedAssembly2/ReferencedAssembly2.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <CLRTestKind>SharedLibrary</CLRTestKind>
     <OutputType>Library</OutputType>
   </PropertyGroup>