-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix sizeof tests for arm and x86 (#38577)
On these tests the arm class layout happens to match the x64/arm64 layout and is different than the x86 layout. So, introduce arm specific test projects for these tests. Also in the recent test build conversion one project was overlooked, so update that project to work with this new scheme as well. Remove all exclusions for these and older variants of these tests. Closes #37470.
- Loading branch information
1 parent
b57b8b9
commit 5bed9e7
Showing
14 changed files
with
111 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_arm.ilproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.IL"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <RestorePackages>true</RestorePackages> | ||
| <CLRTestPriority>1</CLRTestPriority> | ||
| <!-- There are arch-specific versions of this test to allow it to be compiled for all targets --> | ||
| <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported> | ||
| <DebugType>Full</DebugType> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Note arm happens to have the same class layout as 64 bit targets on this test --> | ||
| <Compile Include="64sizeof32.il" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_arm.ilproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.IL"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <RestorePackages>true</RestorePackages> | ||
| <CLRTestPriority>1</CLRTestPriority> | ||
| <DebugType>Full</DebugType> | ||
| <!-- There are arch-specific versions of this test to allow it to be compiled for all targets --> | ||
| <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Note arm happens to have the same class layout as 64 bit targets on this test --> | ||
| <Compile Include="64sizeof64.il" /> | ||
| </ItemGroup> | ||
| </Project> |
13 changes: 13 additions & 0 deletions
13
src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_x86.ilproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.IL"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <RestorePackages>true</RestorePackages> | ||
| <CLRTestPriority>1</CLRTestPriority> | ||
| <DebugType>Full</DebugType> | ||
| <!-- There are arch-specific versions of this test to allow it to be compiled for all targets --> | ||
| <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Compile Include="sizeof64.il" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_arm.ilproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.IL"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <RestorePackages>true</RestorePackages> | ||
| <CLRTestPriority>1</CLRTestPriority> | ||
| <!-- There are arch-specific versions of this test to allow it to be compiled for all targets --> | ||
| <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported> | ||
| <DebugType>Full</DebugType> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Note arm happens to have the same class layout as 64 bit targets on this test --> | ||
| <Compile Include="64sizeof.il" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_arm.ilproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.IL"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <RestorePackages>true</RestorePackages> | ||
| <CLRTestPriority>1</CLRTestPriority> | ||
| <!-- There are arch-specific versions of this test to allow it to be compiled for all targets --> | ||
| <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported> | ||
| <DebugType>PdbOnly</DebugType> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Note arm happens to have the same class layout as 64 bit targets on this test --> | ||
| <Compile Include="64sizeof32.il" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_arm.ilproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.IL"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <RestorePackages>true</RestorePackages> | ||
| <CLRTestPriority>1</CLRTestPriority> | ||
| <!-- There are arch-specific versions of this test to allow it to be compiled for all targets --> | ||
| <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported> | ||
| <DebugType>PdbOnly</DebugType> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Note arm happens to have the same class layout as 64 bit targets on this test --> | ||
| <Compile Include="64sizeof64.il" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_arm.ilproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.IL"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <RestorePackages>true</RestorePackages> | ||
| <CLRTestPriority>1</CLRTestPriority> | ||
| <!-- There are arch-specific versions of this test to allow it to be compiled for all targets --> | ||
| <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported> | ||
| <DebugType>PdbOnly</DebugType> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Note arm happens to have the same class layout as 64 bit targets on this test --> | ||
| <Compile Include="64sizeof.il" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters