Skip to content

Clean up remaining tests under JIT/Methodical using Environment.Exit #64706

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
merged 2 commits into from
Feb 3, 2022
Merged

Clean up remaining tests under JIT/Methodical using Environment.Exit #64706

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
db8d0cf
Clean up remaining tests under JIT/Methodical using Environment.Exit
trylek Jan 2, 2022
35f75ec
Remove unused label per Bruce's PR feedback
trylek Feb 3, 2022
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
8 changes: 6 additions & 2 deletions src/tests/JIT/Methodical/ldtoken/types.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
.class private auto ansi beforefieldinit Test
extends [mscorlib]System.Object
{
.field private static int32 s_exitCode;

.method private hidebysig static void
test_token(object boxed_vt,
valuetype [mscorlib]System.RuntimeTypeHandle vt) cil managed
Expand All @@ -33,7 +35,7 @@
call string [mscorlib]System.String::Concat(string, string)
call void [System.Console]System.Console::WriteLine(string)
ldc.i4.s 101
call void [System.Runtime.Extensions]System.Environment::Exit(int32)
stsfld int32 JitTest.Test::s_exitCode
IL_EXIT:
ret
}
Expand All @@ -45,6 +47,8 @@
)
.entrypoint
.maxstack 8
ldc.i4 100
stsfld int32 JitTest.Test::s_exitCode
ldc.i4.1
box [mscorlib]System.Byte
ldtoken [mscorlib]System.Byte
Expand Down Expand Up @@ -195,7 +199,7 @@

ldstr "Passed"
call void [System.Console]System.Console::WriteLine(string)
ldc.i4.s 100
ldsfld int32 JitTest.Test::s_exitCode
ret
}
.method public hidebysig specialname rtspecialname
Expand Down
9 changes: 5 additions & 4 deletions src/tests/JIT/Methodical/switch/switch1.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
.class public auto ansi Test_switch1
extends ['mscorlib']System.Object
{
.field private static int32 s_exitCode;

.method private hidebysig static void DoSwitch(int32 'value') il managed
{
.maxstack 2
Expand All @@ -32,7 +34,7 @@
IL_0012: br.s IL_0033

IL_0014: ldc.i4.s 100
IL_0016: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0016: stsfld int32 Test_switch1::s_exitCode
IL_001b: ldstr "Test passed"
IL_0020: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0025: br.s IL_003f
Expand All @@ -48,7 +50,7 @@
IL_003f: ret
}

.method public hidebysig static void Main() il managed
.method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand All @@ -57,8 +59,7 @@
.maxstack 8
IL_0000: ldc.i4.1
IL_0001: call void Test_switch1::DoSwitch(int32)
IL_0006: call int32 ['System.Runtime.Extensions']System.Environment::get_ExitCode()
call void ['System.Runtime.Extensions']System.Environment::Exit(int32)
IL_0006: ldsfld int32 Test_switch1::s_exitCode
ret
}

Expand Down
11 changes: 6 additions & 5 deletions src/tests/JIT/Methodical/switch/switch10.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
.class public auto ansi Test_switch10
extends ['mscorlib']System.Object
{
.field private static int32 s_exitCode;

.method private hidebysig static int32
Square(int32 i) il managed
{
Expand Down Expand Up @@ -59,19 +61,19 @@
IL_0018: bne.un.s IL_002d

IL_001a: ldc.i4.s 100
IL_001c: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_001c: stsfld int32 Test_switch10::s_exitCode
IL_0021: ldstr "Test passed"
IL_0026: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_002b: br.s IL_003d

IL_002d: ldc.i4.1
IL_002e: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_002e: stsfld int32 Test_switch10::s_exitCode
IL_0033: ldstr "Test failed"
IL_0038: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_003d: ret
}

.method public hidebysig static void Main() il managed
.method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand All @@ -80,8 +82,7 @@
.maxstack 8
IL_0000: ldc.i4.1
IL_0001: call void Test_switch10::DoSwitch(int32)
IL_0006: call int32 ['System.Runtime.Extensions']System.Environment::get_ExitCode()
call void ['System.Runtime.Extensions']System.Environment::Exit(int32)
IL_0006: ldsfld int32 Test_switch10::s_exitCode
ret
}

Expand Down
9 changes: 5 additions & 4 deletions src/tests/JIT/Methodical/switch/switch11.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
.class public auto ansi Test_switch11
extends ['mscorlib']System.Object
{
.method public hidebysig static void Main() il managed
.field private static int32 s_exitCode;

.method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand All @@ -30,12 +32,11 @@
IL_0002: br.s IL_0004

IL_0004: ldc.i4.s 100
IL_0006: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0006: stsfld int32 Test_switch11::s_exitCode
IL_000b: ldstr "Test passed"
IL_0010: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0015: pop
call int32 ['System.Runtime.Extensions']System.Environment::get_ExitCode()
call void ['System.Runtime.Extensions']System.Environment::Exit(int32)
ldsfld int32 Test_switch11::s_exitCode
ret
}

Expand Down
13 changes: 7 additions & 6 deletions src/tests/JIT/Methodical/switch/switch2.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
.class public auto ansi Test_switch2
extends ['mscorlib']System.Object
{
.field private static int32 s_exitCode;

.method private hidebysig static void DoSwitch(int32 'value') il managed
{
.maxstack 2
Expand Down Expand Up @@ -46,7 +48,7 @@
IL_001e: bne.un.s IL_0031

IL_0020: ldc.i4.s 100
IL_0022: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0022: stsfld int32 Test_switch2::s_exitCode
IL_0027: ldstr "Test passed"
IL_002c: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0031: br.s IL_005f
Expand All @@ -60,21 +62,21 @@
IL_0039: bne.un.s IL_004b

IL_003b: ldc.i4.1
IL_003c: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_003c: stsfld int32 Test_switch2::s_exitCode
IL_0041: ldstr "Test failed"
IL_0046: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_004b: br.s IL_005f

IL_004d: ldc.i4.1
IL_004e: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_004e: stsfld int32 Test_switch2::s_exitCode
IL_0053: ldstr "Test failed"
IL_0058: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_005d: br.s IL_005f

IL_005f: ret
}

.method public hidebysig static void Main() il managed
.method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand All @@ -83,8 +85,7 @@
.maxstack 8
IL_0000: ldc.i4.1
IL_0001: call void Test_switch2::DoSwitch(int32)
IL_0006: call int32 ['System.Runtime.Extensions']System.Environment::get_ExitCode()
call void ['System.Runtime.Extensions']System.Environment::Exit(int32)
ldsfld int32 Test_switch2::s_exitCode
ret
}

Expand Down
11 changes: 6 additions & 5 deletions src/tests/JIT/Methodical/switch/switch3.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
.class public auto ansi Test_switch3
extends ['mscorlib']System.Object
{
.field private static int32 s_exitCode;

.method private hidebysig static void DoSwitch(int32 'value') il managed
{
.maxstack 2
Expand All @@ -34,21 +36,21 @@
IL_0014: br.s IL_0016

IL_0016: ldc.i4.s 100
IL_0018: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0018: stsfld int32 Test_switch3::s_exitCode
IL_001d: ldstr "Test passed"
IL_0022: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0027: br.s IL_003b

IL_0029: ldc.i4.1
IL_002a: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_002a: stsfld int32 Test_switch3::s_exitCode
IL_002f: ldstr "Test failed"
IL_0034: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0039: br.s IL_003b

IL_003b: ret
}

.method public hidebysig static void Main() il managed
.method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand All @@ -57,8 +59,7 @@
.maxstack 8
IL_0000: ldc.i4.1
IL_0001: call void Test_switch3::DoSwitch(int32)
IL_0006: call int32 ['System.Runtime.Extensions']System.Environment::get_ExitCode()
call void ['System.Runtime.Extensions']System.Environment::Exit(int32)
ldsfld int32 Test_switch3::s_exitCode
ret
}

Expand Down
10 changes: 5 additions & 5 deletions src/tests/JIT/Methodical/switch/switch4.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.class public auto ansi Test_switch4
extends ['mscorlib']System.Object
{
.field private static int32 s_exitCode;
.field public static int32 count
.method private hidebysig static void DoSwitch(int32 'value') il managed
{
Expand Down Expand Up @@ -58,19 +59,19 @@
IL_002e: bne.un.s IL_0043

IL_0030: ldc.i4.s 100
IL_0032: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0032: stsfld int32 Test_switch4::s_exitCode
IL_0037: ldstr "Test passed"
IL_003c: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0041: br.s IL_0053

IL_0043: ldc.i4.1
IL_0044: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0044: stsfld int32 Test_switch4::s_exitCode
IL_0049: ldstr "Test failed"
IL_004e: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0053: ret
}

.method public hidebysig static void Main() il managed
.method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand All @@ -79,8 +80,7 @@
.maxstack 8
IL_0000: ldc.i4.1
IL_0001: call void Test_switch4::DoSwitch(int32)
IL_0006: call int32 ['System.Runtime.Extensions']System.Environment::get_ExitCode()
call void ['System.Runtime.Extensions']System.Environment::Exit(int32)
ldsfld int32 Test_switch4::s_exitCode
ret
}

Expand Down
10 changes: 5 additions & 5 deletions src/tests/JIT/Methodical/switch/switch5.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.class public auto ansi TestStack
extends ['mscorlib']System.Object
{
.field public static int32 s_exitCode;
.field public int32[] Stack
.field public int32 top
.method public hidebysig instance void
Expand Down Expand Up @@ -58,13 +59,13 @@
IL_003c: brtrue.s IL_0051

IL_003e: ldc.i4.s 100
IL_0040: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0040: stsfld int32 TestStack::s_exitCode
IL_0045: ldstr "Test passed"
IL_004a: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_004f: br.s IL_0061

IL_0051: ldc.i4.1
IL_0052: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0052: stsfld int32 TestStack::s_exitCode
IL_0057: ldstr "Test failed"
IL_005c: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0061: br.s IL_0063
Expand Down Expand Up @@ -139,7 +140,7 @@
.class public auto ansi Test_switch5
extends ['mscorlib']System.Object
{
.method public hidebysig static void Main() il managed
.method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand All @@ -161,8 +162,7 @@
IL_001b: ldloc.0
IL_001c: ldc.i4.3
IL_001d: call instance void TestStack::DoSwitch(int32)
IL_0022: call int32 ['System.Runtime.Extensions']System.Environment::get_ExitCode()
call void ['System.Runtime.Extensions']System.Environment::Exit(int32)
ldsfld int32 TestStack::s_exitCode
ret
}

Expand Down
11 changes: 6 additions & 5 deletions src/tests/JIT/Methodical/switch/switch6.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
.class public auto ansi Test_switch6
extends ['mscorlib']System.Object
{
.field private static int32 s_exitCode;

.method private hidebysig static void DoSwitch(int32 'value') il managed
{
.maxstack 2
Expand Down Expand Up @@ -68,19 +70,19 @@
IL_002f: bne.un.s IL_0044

IL_0031: ldc.i4.s 100
IL_0033: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0033: stsfld int32 Test_switch6::s_exitCode
IL_0038: ldstr "Test passed"
IL_003d: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0042: br.s IL_0054

IL_0044: ldc.i4.1
IL_0045: call void ['System.Runtime.Extensions']System.Environment::set_ExitCode(int32)
IL_0045: stsfld int32 Test_switch6::s_exitCode
IL_004a: ldstr "Test failed"
IL_004f: call void ['mscorlib']System.Console::WriteLine(class System.String)
IL_0054: ret
}

.method public hidebysig static void Main() il managed
.method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand All @@ -89,8 +91,7 @@
.maxstack 8
IL_0000: ldc.i4.1
IL_0001: call void Test_switch6::DoSwitch(int32)
IL_0006: call int32 ['System.Runtime.Extensions']System.Environment::get_ExitCode()
call void ['System.Runtime.Extensions']System.Environment::Exit(int32)
ldsfld int32 Test_switch6::s_exitCode
ret
}

Expand Down
Loading