diff options
author | Andy Ayers <andya@microsoft.com> | 2019-04-03 14:22:07 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-03 14:22:07 -0700 |
commit | 438feccd7cde138356d35162863e94b8ddba3ee7 (patch) | |
tree | 83603f620069f3611febbd48168bdead4c382ed6 /tests | |
parent | 0164d68225520d2292de144e69d8187ef9768be5 (diff) | |
download | coreclr-438feccd7cde138356d35162863e94b8ddba3ee7.tar.gz coreclr-438feccd7cde138356d35162863e94b8ddba3ee7.tar.bz2 coreclr-438feccd7cde138356d35162863e94b8ddba3ee7.zip |
Fix interop test cases to pass doubles for native varargs. (#23690)
Remove these tests from the windows exclude list. Also move one
other exclude entry from its own section into the general exclude list.
Closes #22974
Diffstat (limited to 'tests')
-rw-r--r-- | tests/issues.targets | 25 | ||||
-rw-r--r-- | tests/src/JIT/jit64/mcc/interop/mcc_i10.il | 28 | ||||
-rw-r--r-- | tests/src/JIT/jit64/mcc/interop/mcc_i11.il | 56 | ||||
-rw-r--r-- | tests/src/JIT/jit64/mcc/interop/mcc_i12.il | 54 | ||||
-rw-r--r-- | tests/src/JIT/jit64/mcc/interop/mcc_i13.il | 58 |
5 files changed, 101 insertions, 120 deletions
diff --git a/tests/issues.targets b/tests/issues.targets index ec060ada89..79e559838d 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -71,6 +71,9 @@ <ExcludeList Include="$(XunitTestBinBase)/tracing/keyword/TwoKeywords/TwoKeywords/*"> <Issue>23224, often fails with timeout in release</Issue> </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)/tracing/tracecontrol/tracecontrol/*"> + <Issue>20299</Issue> + </ExcludeList> </ItemGroup> <!-- All Unix targets --> @@ -256,28 +259,6 @@ </ExcludeList> </ItemGroup> - <ItemGroup Condition="'$(XunitTestBinBase)' != ''"> - <ExcludeList Include="$(XunitTestBinBase)/tracing/tracecontrol/tracecontrol/*"> - <Issue>20299</Issue> - </ExcludeList> - </ItemGroup> - - <!-- Windows specific excludes --> - <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TargetsWindows)' == 'true'"> - <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i11/*"> - <Issue>22974</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i10/*"> - <Issue>22974</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i12/*"> - <Issue>22974</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i13/*"> - <Issue>22974</Issue> - </ExcludeList> - </ItemGroup> - <!-- Windows x64 specific excludes --> <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x64' and '$(TargetsWindows)' == 'true'"> <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_18056/Bool_And_Op_cs_do/*"> diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i10.il b/tests/src/JIT/jit64/mcc/interop/mcc_i10.il index 2ab1864a7a..049bdd888b 100644 --- a/tests/src/JIT/jit64/mcc/interop/mcc_i10.il +++ b/tests/src/JIT/jit64/mcc/interop/mcc_i10.il @@ -13,7 +13,7 @@ .class MyClass { .method assembly static pinvokeimpl("native_i1c" as "#1" cdecl) - vararg valuetype MCCTest.VType1 Sum(float32) cil managed preservesig { + vararg valuetype MCCTest.VType1 Sum(float64) cil managed preservesig { } .method private static int32 Main(string[] args) @@ -39,19 +39,19 @@ ldc.r8 12 ldc.r8 1 neg - call vararg valuetype MCCTest.VType1 MCCTest.MyClass::Sum(float32, ..., - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32) + call vararg valuetype MCCTest.VType1 MCCTest.MyClass::Sum(float64, ..., + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64) stloc.s res diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i11.il b/tests/src/JIT/jit64/mcc/interop/mcc_i11.il index 832d9770a5..d4985355ba 100644 --- a/tests/src/JIT/jit64/mcc/interop/mcc_i11.il +++ b/tests/src/JIT/jit64/mcc/interop/mcc_i11.il @@ -15,7 +15,7 @@ .class MyClass { .method assembly static pinvokeimpl("native_i1c.dll" as "#1" cdecl) - vararg valuetype MCCTest.VType1 Sum(float32) cil managed preservesig { + vararg valuetype MCCTest.VType1 Sum(float64) cil managed preservesig { } .method private static int32 Main(string[] args) @@ -27,34 +27,34 @@ [1] int32 rc ) - ldc.r4 1 - ldc.r4 2 - ldc.r4 3 - ldc.r4 4 - ldc.r4 5 - ldc.r4 6 - ldc.r4 7 - ldc.r4 8 - ldc.r4 9 - ldc.r4 10 - ldc.r4 11 - ldc.r4 12 - ldc.r4 1 + ldc.r8 1 + ldc.r8 2 + ldc.r8 3 + ldc.r8 4 + ldc.r8 5 + ldc.r8 6 + ldc.r8 7 + ldc.r8 8 + ldc.r8 9 + ldc.r8 10 + ldc.r8 11 + ldc.r8 12 + ldc.r8 1 neg - ldftn vararg valuetype MCCTest.VType1 MCCTest.MyClass::Sum(float32) - calli vararg valuetype MCCTest.VType1(float32, ..., - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32) + ldftn vararg valuetype MCCTest.VType1 MCCTest.MyClass::Sum(float64) + calli vararg valuetype MCCTest.VType1(float64, ..., + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64) stloc.s res // Check Result diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i12.il b/tests/src/JIT/jit64/mcc/interop/mcc_i12.il index 557492282f..bf9c60cadf 100644 --- a/tests/src/JIT/jit64/mcc/interop/mcc_i12.il +++ b/tests/src/JIT/jit64/mcc/interop/mcc_i12.il @@ -15,40 +15,40 @@ .class MyClass { .method assembly static pinvokeimpl("native_i1c.dll" as "#1" cdecl) - vararg valuetype MCCTest.VType1 Sum(float32) cil managed preservesig { + vararg valuetype MCCTest.VType1 Sum(float64) cil managed preservesig { } .method private valuetype MCCTest.VType1 GetSum() { .maxstack 64 - ldc.r4 1 - ldc.r4 2 - ldc.r4 3 - ldc.r4 4 - ldc.r4 5 - ldc.r4 6 - ldc.r4 7 - ldc.r4 8 - ldc.r4 9 - ldc.r4 10 - ldc.r4 11 - ldc.r4 12 - ldc.r4 1 + ldc.r8 1 + ldc.r8 2 + ldc.r8 3 + ldc.r8 4 + ldc.r8 5 + ldc.r8 6 + ldc.r8 7 + ldc.r8 8 + ldc.r8 9 + ldc.r8 10 + ldc.r8 11 + ldc.r8 12 + ldc.r8 1 neg tail. - call vararg valuetype MCCTest.VType1 MCCTest.MyClass::Sum(float32, ..., - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32) + call vararg valuetype MCCTest.VType1 MCCTest.MyClass::Sum(float64, ..., + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64) ret } diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i13.il b/tests/src/JIT/jit64/mcc/interop/mcc_i13.il index 3bff174bfb..9509537014 100644 --- a/tests/src/JIT/jit64/mcc/interop/mcc_i13.il +++ b/tests/src/JIT/jit64/mcc/interop/mcc_i13.il @@ -15,45 +15,45 @@ .class MyClass { .method assembly static pinvokeimpl("native_i1c.dll" as "#1" cdecl) - vararg valuetype MCCTest.VType1 Sum(float32) cil managed preservesig { + vararg valuetype MCCTest.VType1 Sum(float64) cil managed preservesig { } .method private valuetype MCCTest.VType1 GetSum() { .maxstack 64 - ldc.r4 1 - ldc.r4 2 - ldc.r4 3 - ldc.r4 4 - ldc.r4 5 - ldc.r4 6 - ldc.r4 7 - ldc.r4 8 - ldc.r4 9 - ldc.r4 10 - ldc.r4 11 - ldc.r4 12 - ldc.r4 1 + ldc.r8 1 + ldc.r8 2 + ldc.r8 3 + ldc.r8 4 + ldc.r8 5 + ldc.r8 6 + ldc.r8 7 + ldc.r8 8 + ldc.r8 9 + ldc.r8 10 + ldc.r8 11 + ldc.r8 12 + ldc.r8 1 neg - call vararg valuetype MCCTest.VType1 MCCTest.MyClass::GetSum2(float32, ..., - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32, - float32) + call vararg valuetype MCCTest.VType1 MCCTest.MyClass::GetSum2(float64, ..., + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64, + float64) ret } - .method private static vararg valuetype MCCTest.VType1 GetSum2(float32) + .method private static vararg valuetype MCCTest.VType1 GetSum2(float64) { - jmp vararg valuetype MCCTest.VType1 MCCTest.MyClass::Sum(float32) + jmp vararg valuetype MCCTest.VType1 MCCTest.MyClass::Sum(float64) } .method public specialname rtspecialname instance void .ctor() |