Skip to content

Commit c942bd2

Browse files
committed
Centralize vararg test exclusions
1 parent 0416028 commit c942bd2

20 files changed

+49
-745
lines changed

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static partial class PlatformDetection
7272
public static bool IsX64Process => RuntimeInformation.ProcessArchitecture == Architecture.X64;
7373
public static bool IsX86Process => RuntimeInformation.ProcessArchitecture == Architecture.X86;
7474
public static bool IsNotX86Process => !IsX86Process;
75-
public static bool IsArgIteratorSupported => IsMonoRuntime || (IsWindows && IsNotArmProcess && !IsNativeAot);
75+
public static bool IsArgIteratorSupported => IsMonoRuntime || (IsWindows && !IsNativeAot);
7676
public static bool IsArgIteratorNotSupported => !IsArgIteratorSupported;
7777
public static bool Is32BitProcess => IntPtr.Size == 4;
7878
public static bool Is64BitProcess => IntPtr.Size == 8;

src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il

Lines changed: 0 additions & 127 deletions
This file was deleted.

src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_32BIT_unaligned_1.ilproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
<!-- Needed for CLRTestTargetUnsupported -->
44
<RequiresProcessIsolation>true</RequiresProcessIsolation>
55
<CLRTestPriority>1</CLRTestPriority>
6-
<!-- There is a 32, arm and 64 version of this test to allow it to be compiled for all targets -->
6+
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
77
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
8-
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'armel'">true</CLRTestTargetUnsupported>
98
<DebugType>PdbOnly</DebugType>
109
<Optimize>True</Optimize>
1110
<!-- Test uses varargs -->

src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_64BIT_unaligned_1.ilproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<!-- Needed for CLRTestTargetUnsupported -->
44
<RequiresProcessIsolation>true</RequiresProcessIsolation>
55
<CLRTestPriority>1</CLRTestPriority>
6-
<!-- There is a 32, arm and 64 version of this test to allow it to be compiled for all targets -->
6+
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
77
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
88
<DebugType>PdbOnly</DebugType>
99
<Optimize>True</Optimize>
1010
<!-- Test uses varargs -->
1111
<NativeAotIncompatible>true</NativeAotIncompatible>
12-
<!-- Tests uses arglist IL opcode -->
12+
<!-- Test uses varargs -->
1313
<InterpreterIncompatible>true</InterpreterIncompatible>
1414
</PropertyGroup>
1515
<ItemGroup>

src/tests/JIT/Directed/PREFIX/unaligned/1/arglist_Target_ARM_unaligned_1.ilproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il

Lines changed: 0 additions & 127 deletions
This file was deleted.

src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_32BIT_unaligned_2.ilproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
<!-- Needed for CLRTestTargetUnsupported -->
44
<RequiresProcessIsolation>true</RequiresProcessIsolation>
55
<CLRTestPriority>1</CLRTestPriority>
6-
<!-- There is a 32, arm and 64 version of this test to allow it to be compiled for all targets -->
6+
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
77
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
8-
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'armel'">true</CLRTestTargetUnsupported>
98
<DebugType>PdbOnly</DebugType>
109
<Optimize>True</Optimize>
1110
<!-- Test uses varargs -->

src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_64BIT_unaligned_2.ilproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<!-- Needed for CLRTestTargetUnsupported -->
44
<RequiresProcessIsolation>true</RequiresProcessIsolation>
55
<CLRTestPriority>1</CLRTestPriority>
6-
<!-- There is a 32, arm and 64 version of this test to allow it to be compiled for all targets -->
6+
<!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
77
<CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
88
<DebugType>PdbOnly</DebugType>
99
<Optimize>True</Optimize>
1010
<!-- Test uses varargs -->
1111
<NativeAotIncompatible>true</NativeAotIncompatible>
12-
<!-- Tests uses arglist IL opcode -->
12+
<!-- Test uses varargs -->
1313
<InterpreterIncompatible>true</InterpreterIncompatible>
1414
</PropertyGroup>
1515
<ItemGroup>

src/tests/JIT/Directed/PREFIX/unaligned/2/arglist_Target_ARM_unaligned_2.ilproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)