Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mono] Fix InlineArray tests on android platforms #90583

Merged
merged 16 commits into from
Aug 16, 2023
Merged

[mono] Fix InlineArray tests on android platforms #90583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0c7628a
Run android jobs
kotlarmilos Aug 15, 2023
66c6ebc
Enable inline array tests
kotlarmilos Aug 15, 2023
60f81bd
Run android jobs only
kotlarmilos Aug 15, 2023
eedb341
Run android jobs only
kotlarmilos Aug 15, 2023
6a334a0
Run android jobs only
kotlarmilos Aug 15, 2023
86f575f
Run android jobs only
kotlarmilos Aug 15, 2023
f30055a
Run android jobs only
kotlarmilos Aug 15, 2023
2b1764c
Run android jobs only
kotlarmilos Aug 15, 2023
ea07b04
Run android jobs only
kotlarmilos Aug 15, 2023
0ff00ab
Run android jobs only
kotlarmilos Aug 15, 2023
9619eb6
Add verbose logging
kotlarmilos Aug 15, 2023
7020da7
Revert runtime changes
kotlarmilos Aug 16, 2023
802d247
Remove android-arm64 job
kotlarmilos Aug 16, 2023
cf14baf
Rename common assembly and revert CI changes
kotlarmilos Aug 16, 2023
bd859f6
Rename assembly name
kotlarmilos Aug 16, 2023
afe2205
Rename assembly name
kotlarmilos Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion .../classloader/InlineArray/InvalidCSharp.il → ...r/InlineArray/InvalidCSharpInlineArray.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ssloader/InlineArray/InvalidCSharp.ilproj → ...lineArray/InvalidCSharpInlineArray.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Compile Include="InvalidCSharp.il" />
<Compile Include="InvalidCSharpInlineArray.il" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand Down