[release/8.0-rc1] [mono] Fix InlineArray tests on android platforms (#…

…90679) * Enable inline array tests * Run android jobs only * Add verbose logging * Revert runtime changes * Remove android-arm64 job * Rename common assembly and revert CI changes * Rename assembly name --------- Co-authored-by: Milos Kotlar <kotlarmilos@gmail.com>
dotnet · Aug 16, 2023 · c96e5ab · c96e5ab
1 parent 7cc25f5
commit c96e5ab
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj b/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
@@ -7,7 +7,7 @@
     <Compile Include="InlineArrayInvalid.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="InvalidCSharp.ilproj" />
+    <ProjectReference Include="InvalidCSharpInlineArray.ilproj" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj b/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj
@@ -7,7 +7,7 @@
     <Compile Include="InlineArrayValid.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="InvalidCSharp.ilproj" />
+    <ProjectReference Include="InvalidCSharpInlineArray.ilproj" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>
diff --git a/.../classloader/InlineArray/InvalidCSharp.il → ...r/InlineArray/InvalidCSharpInlineArray.il b/.../classloader/InlineArray/InvalidCSharp.il → ...r/InlineArray/InvalidCSharpInlineArray.il
@@ -3,7 +3,7 @@
 
 .assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
 
-.assembly InvalidCSharp { }
+.assembly InvalidCSharpInlineArray { }
 
 .class public explicit ansi sealed beforefieldinit Explicit
     extends [System.Runtime]System.ValueType

diff --git a/...ssloader/InlineArray/InvalidCSharp.ilproj → ...lineArray/InvalidCSharpInlineArray.ilproj b/...ssloader/InlineArray/InvalidCSharp.ilproj → ...lineArray/InvalidCSharpInlineArray.ilproj
@@ -3,6 +3,6 @@
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="InvalidCSharp.il" />
+    <Compile Include="InvalidCSharpInlineArray.il" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
@@ -3482,9 +3482,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
             <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/**">
-            <Issue>https://github.com/dotnet/runtime/issues/90398</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">