[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>

diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj b/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
index c9c4d3b..2b17f8c 100644 (file)
--- 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
index 125a6c3..2ed1ccb 100644 (file)
--- 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/src/tests/Loader/classloader/InlineArray/InvalidCSharp.il b/src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.il
similarity index 98%
rename from src/tests/Loader/classloader/InlineArray/InvalidCSharp.il
rename to src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.il
index ff8d65c..af16b27 100644 (file)
--- a/src/tests/Loader/classloader/InlineArray/InvalidCSharp.il
+++ b/src/tests/Loader/classloader/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/src/tests/Loader/classloader/InlineArray/InvalidCSharp.ilproj b/src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.ilproj
similarity index 73%
rename from src/tests/Loader/classloader/InlineArray/InvalidCSharp.ilproj
rename to src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.ilproj
index d577c8f..2a82d64 100644 (file)
--- a/src/tests/Loader/classloader/InlineArray/InvalidCSharp.ilproj
+++ b/src/tests/Loader/classloader/InlineArray/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
index 09e50e7..87f8bbf 100644 (file)
--- 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'">