Skip to content

Commit c7edb61

Browse files
BrzVladBrzVlad
authored
[mono][interp] Enable some tests (#66947)
* [mono][interp] Enable all IL_Conformance tests * [mono][interp] Enable tests * [mono][interp] Enable test * [tests] Fix ckfinite test According to spec, ckfinite can throw ArithmeticException. CoreCLR throws OverflowException while mono throws ArithmeticException. Change test to catch all ArithmeticExceptions.
1 parent b1750b7 commit c7edb61

File tree

4 files changed

+6
-91
lines changed

4 files changed

+6
-91
lines changed

‎src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ handler_end:
2424
done:
2525
ldc.i4 0x00000001
2626
ret
27-
.try try_start to try_end catch [mscorlib]System.OverflowException handler handler_start to handler_end
27+
.try try_start to try_end catch [mscorlib]System.ArithmeticException handler handler_start to handler_end
2828
}
2929

3030
.method public static int32 _ckfinite(float64) {
@@ -44,7 +44,7 @@ handler_end:
4444
done:
4545
ldc.i4 0x00000001
4646
ret
47-
.try try_start to try_end catch [mscorlib]System.OverflowException handler handler_start to handler_end
47+
.try try_start to try_end catch [mscorlib]System.ArithmeticException handler handler_start to handler_end
4848
}
4949

5050
.method public static int32 main(class [mscorlib]System.String[]) {

‎src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ try_end:
4747
ldc.i4 0x0
4848
br FINISH
4949
ae:
50-
isinst [mscorlib]System.OverflowException
50+
isinst [mscorlib]System.ArithmeticException
5151
stloc 0
5252
leave HEnd
5353
HEnd:
@@ -77,7 +77,7 @@ FAIL:
7777
br FINISH
7878
FINISH:
7979
ret
80-
.try try_start to try_end catch [mscorlib]System.OverflowException handler ae to HEnd
80+
.try try_start to try_end catch [mscorlib]System.ArithmeticException handler ae to HEnd
8181
}
8282

8383
.method public static int32 main(class [mscorlib]System.String[]) {

‎src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ try_end:
4949
ldc.i4 0x0
5050
br FINISH
5151
ae:
52-
isinst [mscorlib]System.OverflowException
52+
isinst [mscorlib]System.ArithmeticException
5353
stloc 0
5454
leave HEnd
5555
HEnd:
@@ -81,7 +81,7 @@ FAIL:
8181
br FINISH
8282
FINISH:
8383
ret
84-
.try try_start to try_end catch [mscorlib]System.OverflowException handler ae to HEnd
84+
.try try_start to try_end catch [mscorlib]System.ArithmeticException handler ae to HEnd
8585
}
8686

8787
.method public static int32 main(class [mscorlib]System.String[]) {

‎src/tests/issues.targets

-85
Original file line numberDiff line numberDiff line change
@@ -2095,9 +2095,6 @@
20952095
<ExcludeList Include = "$(XunitTestBinBase)/JIT/jit64/verif/sniff/fg/ver_fg_13/**">
20962096
<Issue>https://github.com/dotnet/runtime/issues/54396</Issue>
20972097
</ExcludeList>
2098-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/NaN/r4nanconv_il_d/**">
2099-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2100-
</ExcludeList>
21012098
<ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/Statics/Misc/LiteralStatic/**">
21022099
<Issue>https://github.com/dotnet/runtime/issues/54560</Issue>
21032100
</ExcludeList>
@@ -2116,9 +2113,6 @@
21162113
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176/**">
21172114
<Issue>needs triage</Issue>
21182115
</ExcludeList>
2119-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883/**">
2120-
<Issue>https://github.com/dotnet/runtime/issues/54394</Issue>
2121-
</ExcludeList>
21222116
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953/**">
21232117
<Issue>needs triage</Issue>
21242118
</ExcludeList>
@@ -2128,12 +2122,6 @@
21282122
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869/**">
21292123
<Issue>needs triage</Issue>
21302124
</ExcludeList>
2131-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964/**">
2132-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2133-
</ExcludeList>
2134-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726/**">
2135-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2136-
</ExcludeList>
21372125
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r/**">
21382126
<Issue>needs triage</Issue>
21392127
</ExcludeList>
@@ -2143,12 +2131,6 @@
21432131
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980/**">
21442132
<Issue>needs triage</Issue>
21452133
</ExcludeList>
2146-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093/**">
2147-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2148-
</ExcludeList>
2149-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/NaN/r4nanconv_il_r/**">
2150-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2151-
</ExcludeList>
21522134
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956/**">
21532135
<Issue>needs triage</Issue>
21542136
</ExcludeList>
@@ -2164,18 +2146,6 @@
21642146
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/volatilstind/**">
21652147
<Issue>needs triage</Issue>
21662148
</ExcludeList>
2167-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879/**">
2168-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2169-
</ExcludeList>
2170-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873/**">
2171-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2172-
</ExcludeList>
2173-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179/**">
2174-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2175-
</ExcludeList>
2176-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578/**">
2177-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2178-
</ExcludeList>
21792149
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597/**">
21802150
<Issue>needs triage</Issue>
21812151
</ExcludeList>
@@ -2185,15 +2155,9 @@
21852155
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/refany/indcall_il_d/**">
21862156
<Issue>needs triage</Issue>
21872157
</ExcludeList>
2188-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614/**">
2189-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2190-
</ExcludeList>
21912158
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027/**">
21922159
<Issue>needs triage</Issue>
21932160
</ExcludeList>
2194-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354/**">
2195-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2196-
</ExcludeList>
21972161
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_605447/DevDiv_605447/**">
21982162
<Issue>https://github.com/dotnet/runtime/issues/54391</Issue>
21992163
</ExcludeList>
@@ -2236,9 +2200,6 @@
22362200
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Invoke/fptr/valftn_t_il_r/**">
22372201
<Issue>needs triage</Issue>
22382202
</ExcludeList>
2239-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_710234/DevDiv_710234/**">
2240-
<Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
2241-
</ExcludeList>
22422203
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d/**">
22432204
<Issue>needs triage</Issue>
22442205
</ExcludeList>
@@ -2356,9 +2317,6 @@
23562317
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d/**">
23572318
<Issue>needs triage</Issue>
23582319
</ExcludeList>
2359-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/div_r8/**">
2360-
<Issue>https://github.com/dotnet/runtime/issues/54375</Issue>
2361-
</ExcludeList>
23622320
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Invoke/deep/deep1_il_r/**">
23632321
<Issue>needs triage</Issue>
23642322
</ExcludeList>
@@ -2494,9 +2452,6 @@
24942452
<ExcludeList Include = "$(XunitTestBinBase)/JIT/CodeGenBringUpTests/Localloc_ro/**">
24952453
<Issue>https://github.com/dotnet/runtime/issues/54359</Issue>
24962454
</ExcludeList>
2497-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/neg_r4/**">
2498-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2499-
</ExcludeList>
25002455
<ExcludeList Include = "$(XunitTestBinBase)/JIT/CodeGenBringUpTests/Localloc_d/**">
25012456
<Issue>https://github.com/dotnet/runtime/issues/54359</Issue>
25022457
</ExcludeList>
@@ -2524,9 +2479,6 @@
25242479
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878/**">
25252480
<Issue>https://github.com/dotnet/runtime/issues/54392</Issue>
25262481
</ExcludeList>
2527-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/add_r4/**">
2528-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2529-
</ExcludeList>
25302482
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726/**">
25312483
<Issue>https://github.com/dotnet/runtime/issues/54392</Issue>
25322484
</ExcludeList>
@@ -2536,30 +2488,12 @@
25362488
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d/**">
25372489
<Issue>needs triage</Issue>
25382490
</ExcludeList>
2539-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/mul_r4/**">
2540-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2541-
</ExcludeList>
25422491
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909/**">
25432492
<Issue>https://github.com/dotnet/runtime/issues/54392</Issue>
25442493
</ExcludeList>
25452494
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r/**">
25462495
<Issue>needs triage</Issue>
25472496
</ExcludeList>
2548-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/rem_r4/**">
2549-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2550-
</ExcludeList>
2551-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4/**">
2552-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2553-
</ExcludeList>
2554-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/div_r4/**">
2555-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2556-
</ExcludeList>
2557-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/sub_r4/**">
2558-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2559-
</ExcludeList>
2560-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4/**">
2561-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2562-
</ExcludeList>
25632497
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/volatilldind/**">
25642498
<Issue>needs triage</Issue>
25652499
</ExcludeList>
@@ -2578,9 +2512,6 @@
25782512
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/eh/basics/throwinfilter_il_r/**">
25792513
<Issue>https://github.com/dotnet/runtime/issues/47624</Issue>
25802514
</ExcludeList>
2581-
<ExcludeList Include = "$(XunitTestBinBase)JIT/IL_Conformance/Old/Base/ckfinite/**">
2582-
<Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
2583-
</ExcludeList>
25842515
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/JitBlue/Runtime_64125/Runtime_64125/**">
25852516
<Issue>needs triage</Issue>
25862517
</ExcludeList>
@@ -3094,10 +3025,6 @@
30943025

30953026
<!-- These are known failures on mono-arm64 in the interpreter runtime variant -->
30963027
<ItemGroup Condition=" '$(RuntimeFlavor)' == 'mono' and ('$(TargetArchitecture)' == 'arm64') and '$(TargetsWindows)' != 'true' and '$(RuntimeVariant)' == 'monointerpreter' " >
3097-
<!-- The following issues only effect the Mono interpreter; there is currently no way to exclude based on that scenario -->
3098-
<ExcludeList Include = "$(XunitTestBinBase)JIT/IL_Conformance/Old/Base/ckfinite/**">
3099-
<Issue>needs triage</Issue>
3100-
</ExcludeList>
31013028
<ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/pauseonstart/**">
31023029
<Issue> needs triage </Issue>
31033030
</ExcludeList>
@@ -3206,12 +3133,6 @@
32063133
<ExcludeList Include = "$(XunitTestBinBase)/JIT/jit64/opt/cse/VolatileTest_op_mul/**">
32073134
<Issue>https://github.com/dotnet/runtime/issues/41472</Issue>
32083135
</ExcludeList>
3209-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i/**">
3210-
<Issue>needs triage</Issue>
3211-
</ExcludeList>
3212-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i/**">
3213-
<Issue>needs triage</Issue>
3214-
</ExcludeList>
32153136
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/eh/interactions/switchinfinally_d/**">
32163137
<Issue>needs triage</Issue>
32173138
</ExcludeList>
@@ -3236,12 +3157,6 @@
32363157
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/VT/callconv/jumps4_il_d/**">
32373158
<Issue>needs triage</Issue>
32383159
</ExcludeList>
3239-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/NaN/r8nanconv_il_d/**">
3240-
<Issue>needs triage</Issue>
3241-
</ExcludeList>
3242-
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/NaN/r8nanconv_il_r/**">
3243-
<Issue>needs triage</Issue>
3244-
</ExcludeList>
32453160
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/gc_poll/InsertGCPoll/**">
32463161
<Issue>needs triage</Issue>
32473162
</ExcludeList>

0 commit comments

Comments
 (0)