Skip to content

Commit dadc7ce

Browse files
trylektrylek
authored
Unify JIT/Methodical/eh/common and JIT/jit64/eh/common (#63597)
I have moved the support library under JIT/common similar to treatment of the localloc/common library I'm moving in #63510 I have slightly modified the implementation to support merged tests (let each test case use its own StringRecorder). Thanks Tomas
1 parent 4f89b79 commit dadc7ce

File tree

515 files changed

+1069
-1366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

515 files changed

+1069
-1366
lines changed

‎src/tests/JIT/Methodical/eh/basics/emptyfinally.il

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.ver 4:0:0:0
1010
}
1111
.assembly extern mscorlib {}
12-
.assembly extern common {}
12+
.assembly extern eh_common {}
1313
.assembly 'emptyfinally' {}
1414
.assembly extern xunit.core {}
1515

@@ -18,7 +18,7 @@
1818
.class private auto ansi beforefieldinit Class1
1919
extends [mscorlib]System.Object
2020
{
21-
.field private static class [common]TestUtil.TestLog testLog
21+
.field private static class [eh_common]TestUtil.TestLog testLog
2222
.method private hidebysig specialname rtspecialname static void .cctor() cil managed
2323
{
2424
.maxstack 2
@@ -32,8 +32,8 @@
3232
ldstr "Done"
3333
callvirt instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
3434
ldloc.s expectedOut
35-
newobj instance void [common]TestUtil.TestLog::.ctor(object)
36-
stsfld class [common]TestUtil.TestLog hello.Class1::testLog
35+
newobj instance void [eh_common]TestUtil.TestLog::.ctor(object)
36+
stsfld class [eh_common]TestUtil.TestLog hello.Class1::testLog
3737
ret
3838
}
3939

@@ -56,8 +56,8 @@
5656
.entrypoint
5757
.maxstack 1
5858

59-
ldsfld class [common]TestUtil.TestLog hello.Class1::testLog
60-
callvirt instance void [common]TestUtil.TestLog::StartRecording()
59+
ldsfld class [eh_common]TestUtil.TestLog hello.Class1::testLog
60+
callvirt instance void [eh_common]TestUtil.TestLog::StartRecording()
6161

6262
.try
6363
{
@@ -71,11 +71,11 @@
7171
ldstr "Done"
7272
call void [System.Console]System.Console::WriteLine(string)
7373

74-
ldsfld class [common]TestUtil.TestLog hello.Class1::testLog
75-
callvirt instance void [common]TestUtil.TestLog::StopRecording()
74+
ldsfld class [eh_common]TestUtil.TestLog hello.Class1::testLog
75+
callvirt instance void [eh_common]TestUtil.TestLog::StopRecording()
7676

77-
ldsfld class [common]TestUtil.TestLog hello.Class1::testLog
78-
callvirt instance int32 [common]TestUtil.TestLog::VerifyOutput()
77+
ldsfld class [eh_common]TestUtil.TestLog hello.Class1::testLog
78+
callvirt instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
7979

8080
ret
8181
}

‎src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<Compile Include="emptyfinally.il" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<ProjectReference Include="..\common\common.csproj" />
12+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1313
</ItemGroup>
1414
</Project>

‎src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="emptyfinally.il" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/multihandler_d.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="multihandler.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/multihandler_do.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="multihandler.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/multihandler_r.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="multihandler.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/multihandler_ro.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="multihandler.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwincatch_d.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<Compile Include="throwincatch.cs" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\common\common.csproj" />
15+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1616
</ItemGroup>
1717
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwincatch_do.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<Compile Include="throwincatch.cs" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\common\common.csproj" />
15+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1616
</ItemGroup>
1717
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwincatch_r.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<Compile Include="throwincatch.cs" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\common\common.csproj" />
15+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1616
</ItemGroup>
1717
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwincatch_ro.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<Compile Include="throwincatch.cs" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\common\common.csproj" />
15+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1616
</ItemGroup>
1717
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="throwinclassconstructor.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="throwinclassconstructor.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="throwinclassconstructor.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="throwinclassconstructor.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinexcept.il

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.ver 4:0:0:0
1010
}
1111
.assembly extern mscorlib {}
12-
.assembly extern common {}
12+
.assembly extern eh_common {}
1313
.assembly test {}
1414
.module test.exe
1515

@@ -18,7 +18,7 @@
1818
.maxstack 2
1919
.locals init (
2020
class [mscorlib]System.IO.StringWriter expectedOut,
21-
class [common]TestUtil.TestLog testLog
21+
class [eh_common]TestUtil.TestLog testLog
2222
)
2323

2424
newobj instance void [mscorlib]System.IO.StringWriter::.ctor()
@@ -39,11 +39,11 @@
3939
ldstr "Done"
4040
callvirt instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
4141
ldloc.s expectedOut
42-
newobj instance void [common]TestUtil.TestLog::.ctor(object)
42+
newobj instance void [eh_common]TestUtil.TestLog::.ctor(object)
4343
stloc.s testLog
4444

4545
ldloc.s testLog
46-
callvirt instance void [common]TestUtil.TestLog::StartRecording()
46+
callvirt instance void [eh_common]TestUtil.TestLog::StartRecording()
4747

4848
.try {
4949
try_start:
@@ -78,10 +78,10 @@ done2:
7878
call void [System.Console]System.Console::WriteLine(string)
7979

8080
ldloc.s testLog
81-
callvirt instance void [common]TestUtil.TestLog::StopRecording()
81+
callvirt instance void [eh_common]TestUtil.TestLog::StopRecording()
8282

8383
ldloc.s testLog
84-
callvirt instance int32 [common]TestUtil.TestLog::VerifyOutput()
84+
callvirt instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
8585

8686
ret
8787
}

‎src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<Compile Include="throwinexcept.il" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<ProjectReference Include="..\common\common.csproj" />
12+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1313
</ItemGroup>
1414
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<Compile Include="throwinexcept.il" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<ProjectReference Include="..\common\common.csproj" />
13+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1414
</ItemGroup>
1515
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfault.il

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.ver 4:0:0:0
1010
}
1111
.assembly extern mscorlib {}
12-
.assembly extern common {}
12+
.assembly extern eh_common {}
1313
.assembly test {}
1414
.module test.exe
1515

@@ -18,7 +18,7 @@
1818
.maxstack 2
1919
.locals init (
2020
class [mscorlib]System.IO.StringWriter expectedOut,
21-
class [common]TestUtil.TestLog testLog
21+
class [eh_common]TestUtil.TestLog testLog
2222
)
2323

2424
newobj instance void [mscorlib]System.IO.StringWriter::.ctor()
@@ -36,11 +36,11 @@
3636
ldstr "In catch"
3737
callvirt instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
3838
ldloc.s expectedOut
39-
newobj instance void [common]TestUtil.TestLog::.ctor(object)
39+
newobj instance void [eh_common]TestUtil.TestLog::.ctor(object)
4040
stloc.s testLog
4141

4242
ldloc.s testLog
43-
callvirt instance void [common]TestUtil.TestLog::StartRecording()
43+
callvirt instance void [eh_common]TestUtil.TestLog::StartRecording()
4444

4545
.try {
4646
ldstr "In try - catch"
@@ -72,10 +72,10 @@
7272
done:
7373

7474
ldloc.s testLog
75-
callvirt instance void [common]TestUtil.TestLog::StopRecording()
75+
callvirt instance void [eh_common]TestUtil.TestLog::StopRecording()
7676

7777
ldloc.s testLog
78-
callvirt instance int32 [common]TestUtil.TestLog::VerifyOutput()
78+
callvirt instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
7979

8080
ret
8181
}

‎src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<Compile Include="throwinfault.il" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<ProjectReference Include="..\common\common.csproj" />
12+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1313
</ItemGroup>
1414
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<Compile Include="throwinfault.il" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<ProjectReference Include="..\common\common.csproj" />
13+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1414
</ItemGroup>
1515
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfilter.il

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.ver 4:0:0:0
1010
}
1111
.assembly extern mscorlib {}
12-
.assembly extern common {}
12+
.assembly extern eh_common {}
1313
.assembly test {}
1414
.module test.exe
1515

@@ -18,7 +18,7 @@
1818
.maxstack 2
1919
.locals init (
2020
class [mscorlib]System.IO.StringWriter expectedOut,
21-
class [common]TestUtil.TestLog testLog
21+
class [eh_common]TestUtil.TestLog testLog
2222
)
2323

2424
newobj instance void [mscorlib]System.IO.StringWriter::.ctor()
@@ -36,11 +36,11 @@
3636
ldstr "Done"
3737
callvirt instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
3838
ldloc.s expectedOut
39-
newobj instance void [common]TestUtil.TestLog::.ctor(object)
39+
newobj instance void [eh_common]TestUtil.TestLog::.ctor(object)
4040
stloc.s testLog
4141

4242
ldloc.s testLog
43-
callvirt instance void [common]TestUtil.TestLog::StartRecording()
43+
callvirt instance void [eh_common]TestUtil.TestLog::StartRecording()
4444

4545
.try {
4646
try_start:
@@ -75,10 +75,10 @@ done2:
7575
call void [System.Console]System.Console::WriteLine(string)
7676

7777
ldloc.s testLog
78-
callvirt instance void [common]TestUtil.TestLog::StopRecording()
78+
callvirt instance void [eh_common]TestUtil.TestLog::StopRecording()
7979

8080
ldloc.s testLog
81-
callvirt instance int32 [common]TestUtil.TestLog::VerifyOutput()
81+
callvirt instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()
8282

8383
ret
8484
}

‎src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<Compile Include="throwinfilter.il" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<ProjectReference Include="..\common\common.csproj" />
12+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1313
</ItemGroup>
1414
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<Compile Include="throwinfilter.il" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<ProjectReference Include="..\common\common.csproj" />
13+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1414
</ItemGroup>
1515
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfinally_d.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="throwinfinally.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfinally_do.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="throwinfinally.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfinally_r.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="throwinfinally.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfinally_ro.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<Compile Include="throwinfinally.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ProjectReference Include="..\common\common.csproj" />
14+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1515
</ItemGroup>
1616
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<Compile Include="throwinfinallyerrpath.cs" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\common\common.csproj" />
15+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1616
</ItemGroup>
1717
</Project>

‎src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<Compile Include="throwinfinallyerrpath.cs" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\common\common.csproj" />
15+
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
1616
</ItemGroup>
1717
</Project>

0 commit comments

Comments
 (0)