Skip to content

Fix sizeof tests for arm and x86 #38577

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

Merged
AndyAyersMS merged 2 commits into from
Jun 30, 2020
Merged

Fix sizeof tests for arm and x86 #38577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54de37a
Fix sizeof tests for arm and x86
AndyAyersMS Jun 29, 2020
badd850
remove test exclusions
AndyAyersMS Jun 29, 2020
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
36 changes: 0 additions & 36 deletions src/coreclr/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,24 +121,6 @@
<ExcludeList Include="$(XunitTestBinBase)/baseservices/mono/runningmono/*">
<Issue>This test is to verify we are running mono, and therefore only makes sense on mono.</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit/*">
<Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64/*">
<Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit/*">
<Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit/*">
<Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit/*">
<Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit/*">
<Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
</ExcludeList>
</ItemGroup>

<!-- All Unix targets on all runtimes -->
Expand Down Expand Up @@ -166,24 +148,6 @@
<ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32BIT/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32BIT/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32BIT/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32BIT/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32BIT/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32BIT/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/HugeArray1/*">
<Issue>needs triage</Issue>
</ExcludeList>
Expand Down
14 changes: 14 additions & 0 deletions src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_arm.ilproj
View file
Open in desktop
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>
7 changes: 3 additions & 4 deletions ...dical/xxobj/sizeof/_il_dbgsizeof64.ilproj → ...f/_il_dbgsizeof32_Target_32Bit_x86.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
<!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
<DebugType>Full</DebugType>
</PropertyGroup>
<ItemGroup>
<Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof64.il" />
<Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof64.il" />
<Compile Include="sizeof32.il" />
</ItemGroup>
</Project>
14 changes: 14 additions & 0 deletions src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_arm.ilproj
View file
Open in desktop
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 src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_x86.ilproj
View file
Open in desktop
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>
6 changes: 3 additions & 3 deletions ...izeof/_il_dbgsizeof32_Target_32Bit.ilproj → ...izeof/_il_dbgsizeof64_Target_64Bit.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
<DebugType>Full</DebugType>
<!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="sizeof32.il" />
<Compile Include="64sizeof64.il" />
</ItemGroup>
</Project>
14 changes: 14 additions & 0 deletions src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_arm.ilproj
View file
Open in desktop
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>
4 changes: 2 additions & 2 deletions .../sizeof/_il_dbgsizeof_Target_32Bit.ilproj → ...eof/_il_dbgsizeof_Target_32Bit_x86.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
<!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
<DebugType>Full</DebugType>
</PropertyGroup>
<ItemGroup>
Expand Down
14 changes: 14 additions & 0 deletions src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_arm.ilproj
View file
Open in desktop
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>
4 changes: 2 additions & 2 deletions ...izeof/_il_relsizeof32_Target_32Bit.ilproj → ...f/_il_relsizeof32_Target_32Bit_x86.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
<!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
<DebugType>PdbOnly</DebugType>
</PropertyGroup>
<ItemGroup>
Expand Down
14 changes: 14 additions & 0 deletions src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_arm.ilproj
View file
Open in desktop
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>
4 changes: 2 additions & 2 deletions ...izeof/_il_relsizeof64_Target_32Bit.ilproj → ...f/_il_relsizeof64_Target_32Bit_x86.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
<!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
<DebugType>PdbOnly</DebugType>
</PropertyGroup>
<ItemGroup>
Expand Down
14 changes: 14 additions & 0 deletions src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_arm.ilproj
View file
Open in desktop
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>
4 changes: 2 additions & 2 deletions .../sizeof/_il_relsizeof_Target_32Bit.ilproj → ...eof/_il_relsizeof_Target_32Bit_x86.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
<!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
<DebugType>PdbOnly</DebugType>
</PropertyGroup>
<ItemGroup>
Expand Down