Skip to content

Commit

Permalink
Switch over JIT/Methodical tests to run using merged wrappers (#65597)
Browse files Browse the repository at this point in the history
  • Loading branch information
@trylek
trylek authored Apr 18, 2022
1 parent 74e1d4d commit f865423
Show file tree
Hide file tree
Showing 2,655 changed files with 10,300 additions and 10,905 deletions.
36 changes: 0 additions & 36 deletions src/tests/Common/testgrouping.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,42 +180,6 @@
<XUnitWrapperDll>$(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll</XUnitWrapperDll>
</TestGrouping>

<TestGrouping Include="$(TestBinDir)JIT\Methodical\a*\**;
$(TestBinDir)JIT\Methodical\b*\**;
$(TestBinDir)JIT\Methodical\c*\**;
$(TestBinDir)JIT\Methodical\d*\**;
$(TestBinDir)JIT\Methodical\A*\**;
$(TestBinDir)JIT\Methodical\B*\**;
$(TestBinDir)JIT\Methodical\C*\**;
$(TestBinDir)JIT\Methodical\D*\**">
<TestGroup>JIT.Methodical.a-dA-D</TestGroup>
<XUnitWrapperDll>$(TestBinDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll</XUnitWrapperDll>
</TestGrouping>

<TestGrouping Include="$(TestBinDir)JIT\Methodical\eh\**">
<TestGroup>JIT.Methodical.eh</TestGroup>
<XUnitWrapperDll>$(TestBinDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll</XUnitWrapperDll>
</TestGrouping>

<TestGrouping Include="$(TestBinDir)JIT\Methodical\e*\**;
$(TestBinDir)JIT\Methodical\E*\**"
Exclude="$(TestBinDir)JIT\Methodical\eh\**">
<TestGroup>JIT.Methodical.eE</TestGroup>
<XUnitWrapperDll>$(TestBinDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll</XUnitWrapperDll>
</TestGrouping>

<TestGrouping Include="$(TestBinDir)JIT\Methodical\f*\**;
$(TestBinDir)JIT\Methodical\g*\**;
$(TestBinDir)JIT\Methodical\h*\**;
$(TestBinDir)JIT\Methodical\i*\**;
$(TestBinDir)JIT\Methodical\F*\**;
$(TestBinDir)JIT\Methodical\G*\**;
$(TestBinDir)JIT\Methodical\H*\**;
$(TestBinDir)JIT\Methodical\I*\**">
<TestGroup>JIT.Methodical.f-iF-I</TestGroup>
<XUnitWrapperDll>$(TestBinDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll</XUnitWrapperDll>
</TestGrouping>

<TestGrouping Include="$(TestBinDir)JIT\Regression\CLR-x86-JIT\V1-M09*\**;
$(TestBinDir)JIT\Regression\CLR-x86-JIT\V1-M10*\**;
$(TestBinDir)JIT\Regression\CLR-x86-JIT\V1-M11*\**">
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Directory.Build.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
<!-- We don't want the out-of-process test marker file to be included in referencing projects, so we don't include it as content. -->
<WriteLinesToFile
Condition="'$(RequiresProcessIsolation)' == 'true' and '$(BuildAsStandalone)' != 'true'"
File="$(OutputPath)\$(MSBuildProjectName).OutOfProcessTest"
File="$(OutputPath)\$(AssemblyName).OutOfProcessTest"
Lines="OutOfProcessTest"
Overwrite="true"
WriteOnlyWhenDifferent="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/tests/JIT/Methodical/Arrays/huge/huge_b.il
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

}
.assembly extern xunit.core {}
.namespace JitTest
.namespace JitTest_huge_b_huge_il
{
.class private auto ansi Test
.class public auto ansi Test
extends [mscorlib]System.Object
{
.method private hidebysig static int32
.method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
Expand Down Expand Up @@ -457,4 +457,4 @@

} // end of class 'Test'

} // end of namespace 'JitTest'
} // end of namespace 'JitTest_huge_b_huge_il'
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_b_il_d.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

}
.assembly extern xunit.core {}
.namespace JitTest
.namespace JitTest_huge_i4_huge_il
{
.class private auto ansi Test
.class public auto ansi Test
extends [mscorlib]System.Object
{
.method private hidebysig static int32
.method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
Expand Down Expand Up @@ -465,4 +465,4 @@

} // end of class 'Test'

} // end of namespace 'JitTest'
} // end of namespace 'JitTest_huge_i4_huge_il'
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup>
Expand Down
48 changes: 24 additions & 24 deletions src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{
}
.assembly extern xunit.core {}
.namespace JitTest
.namespace JitTest_huge_objref_huge_il
{
.class private auto ansi sealed TestClass extends [mscorlib]System.Object
{
Expand All @@ -42,21 +42,21 @@
}
} // end of class 'TestClass'

.class private auto ansi Test
.class public auto ansi Test
extends [mscorlib]System.Object
{
.method private hidebysig static int32
.method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
.entrypoint
.maxstack 70
.locals (class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
.locals (class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
int32 count,
int32[] dim,
class JitTest.TestClass ref)
class JitTest_huge_objref_huge_il.TestClass ref)

ldstr "Creating 32-dimension array"
call void [System.Console]System.Console::WriteLine(string)
Expand Down Expand Up @@ -182,7 +182,7 @@
ldloc dim ldc.i4 61 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
ldloc dim ldc.i4 63 ldelem.i4
newobj instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
newobj instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
Expand Down Expand Up @@ -235,7 +235,7 @@
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4

newobj instance void JitTest.TestClass::.ctor()
newobj instance void JitTest_huge_objref_huge_il.TestClass::.ctor()
dup
dup
ldc.i4 99
Expand All @@ -244,16 +244,16 @@
ldc.i4 98
ldc.r8 8.0
stelem.r8
stfld float64[] JitTest.TestClass::dbl_ptr
stfld float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
ldc.i4 0x05071975
stfld int32 JitTest.TestClass::magic
stfld int32 JitTest_huge_objref_huge_il.TestClass::magic

call void [mscorlib]System.GC::Collect()

dup
stloc ref

callvirt instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
callvirt instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
Expand All @@ -262,7 +262,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
class JitTest.TestClass)
class JitTest_huge_objref_huge_il.TestClass)

ldloc matrix
ldloc dim ldc.i4.0 ldelem.i4
Expand Down Expand Up @@ -297,7 +297,7 @@
ldloc dim ldc.i4 58 ldelem.i4
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
callvirt instance class JitTest.TestClass class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
callvirt instance class JitTest_huge_objref_huge_il.TestClass class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
Expand All @@ -308,7 +308,7 @@
int32, int32, int32, int32)

dup
ldfld float64[] JitTest.TestClass::dbl_ptr
ldfld float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
Expand All @@ -317,7 +317,7 @@
pop
br throw0
next0_0:
ldfld int32 JitTest.TestClass::magic
ldfld int32 JitTest_huge_objref_huge_il.TestClass::magic
ldc.i4 0x05071975
ceq
brfalse throw0
Expand Down Expand Up @@ -363,7 +363,7 @@
br cont3

go1:
call instance class JitTest.TestClass class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
call instance class JitTest_huge_objref_huge_il.TestClass class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
Expand All @@ -373,7 +373,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32)
dup
ldfld float64[] JitTest.TestClass::dbl_ptr
ldfld float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
Expand All @@ -382,7 +382,7 @@
pop
br throw0
next0_1:
ldfld int32 JitTest.TestClass::magic
ldfld int32 JitTest_huge_objref_huge_il.TestClass::magic
ldc.i4 0x05071975
ceq
brfalse throw0
Expand Down Expand Up @@ -431,7 +431,7 @@
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
ldloc ref
call instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
call instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
Expand All @@ -440,7 +440,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
class JitTest.TestClass)
class JitTest_huge_objref_huge_il.TestClass)
ldnull
stloc matrix
call void [mscorlib]System.GC::Collect()
Expand Down Expand Up @@ -490,7 +490,7 @@
ldloc dim ldc.i4 58 ldelem.i4
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
callvirt instance class JitTest.TestClass& class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
callvirt instance class JitTest_huge_objref_huge_il.TestClass& class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
Expand All @@ -501,7 +501,7 @@
int32, int32, int32, int32)
dup
ldind.ref
ldfld float64[] JitTest.TestClass::dbl_ptr
ldfld float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
Expand All @@ -513,12 +513,12 @@
next0_2:
dup
ldind.ref
ldfld int32 JitTest.TestClass::magic
ldfld int32 JitTest_huge_objref_huge_il.TestClass::magic
ldc.i4 0x05071975
ceq
brfalse pop_and_throw
ldind.ref
callvirt instance string JitTest.TestClass::ToString()
callvirt instance string JitTest_huge_objref_huge_il.TestClass::ToString()
call void [System.Console]System.Console::WriteLine(string)
br pass2

Expand All @@ -537,4 +537,4 @@

} // end of class 'Test'

} // end of namespace 'JitTest'
} // end of namespace 'JitTest_huge_objref_huge_il'
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

}
.assembly extern xunit.core {}
.namespace JitTest
.namespace JitTest_huge_r4_huge_il
{
.class private auto ansi Test
.class public auto ansi Test
extends [mscorlib]System.Object
{
.method private hidebysig static int32
.method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
Expand Down Expand Up @@ -493,4 +493,4 @@

} // end of class 'Test'

} // end of namespace 'JitTest'
} // end of namespace 'JitTest_huge_r4_huge_il'
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

}
.assembly extern xunit.core {}
.namespace JitTest
.namespace JitTest_huge_r8_huge_il
{
.class private auto ansi Test
.class public auto ansi Test
extends [mscorlib]System.Object
{
.method private hidebysig static int32
.method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
Expand Down Expand Up @@ -493,4 +493,4 @@

} // end of class 'Test'

} // end of namespace 'JitTest'
} // end of namespace 'JitTest_huge_r8_huge_il'
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
Expand Down
Loading

0 comments on commit f865423

Please sign in to comment.