Skip to content

Move unsupported target conditions to IL in mcc tests #112399

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 11 commits into from
Mar 20, 2025
Merged

Move unsupported target conditions to IL in mcc tests #112399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8ee361
Bring back CLRTestTargetUnsupported to mcc build projects
tomeksowi Feb 11, 2025
166c8a7
Remove redundant CLRTestTargetUnsupported in jit64_2
tomeksowi Feb 13, 2025
1c7bcf1
Revert "Remove redundant CLRTestTargetUnsupported in jit64_2"
tomeksowi Feb 13, 2025
f8bce77
Merge branch 'main' into fix-mcc-test-build
tomeksowi Mar 11, 2025
005cfef
Pilot use of ConditionalFact in IL test, TOOD: why XUnitWrapperGenera…
tomeksowi Mar 13, 2025
40ccd16
Revert "Pilot use of ConditionalFact in IL test, TOOD: why XUnitWrapp…
tomeksowi Mar 14, 2025
a719ac8
Revert "Bring back CLRTestTargetUnsupported to mcc build projects"
tomeksowi Mar 14, 2025
dc1c487
Move test conditions to IL
tomeksowi Mar 14, 2025
80ac679
Redundant .entrypoint
tomeksowi Mar 17, 2025
1e46cbf
Review
tomeksowi Mar 19, 2025
ba5747b
Restore condition for merged jit64_2 runner
tomeksowi Mar 20, 2025
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
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i00.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern xunit.core {}
.assembly extern mscorlib { auto }
.assembly extern TestLibrary {}

.assembly 'mcc_i00' {}

Expand All @@ -23,6 +24,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] valuetype MCCTest.VType0 res,
Expand Down Expand Up @@ -67,7 +81,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/mcc/interop/mcc_i00.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Compile Include="mcc_i00.il ..\common\common.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i01.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern xunit.core {}
.assembly extern mscorlib { auto }
.assembly extern TestLibrary {}

.assembly 'mcc_i01' {}

Expand All @@ -23,6 +24,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] valuetype MCCTest.VType0 res,
Expand Down Expand Up @@ -67,7 +81,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/mcc/interop/mcc_i01.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Compile Include="mcc_i01.il ..\common\common.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i02.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern xunit.core {}
.assembly extern mscorlib { auto }
.assembly extern TestLibrary {}

.assembly 'mcc_i02' {}

Expand Down Expand Up @@ -65,6 +66,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] class MCCTest.MyClass me,
Expand All @@ -87,7 +101,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/mcc/interop/mcc_i02.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Compile Include="mcc_i02.il ..\common\common.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i03.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern xunit.core {}
.assembly extern mscorlib { auto }
.assembly extern TestLibrary {}

.assembly 'mcc_i03' {}

Expand Down Expand Up @@ -69,6 +70,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] class MCCTest.MyClass me,
Expand All @@ -91,7 +105,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/mcc/interop/mcc_i03.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Compile Include="mcc_i03.il ..\common\common.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i04.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern xunit.core {}
.assembly extern mscorlib { auto }
.assembly extern TestLibrary {}

.assembly 'mcc_i04' {}

Expand All @@ -23,6 +24,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] valuetype MCCTest.VType0 res,
Expand Down Expand Up @@ -64,7 +78,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/mcc/interop/mcc_i04.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<Compile Include="mcc_i04.il ..\common\common.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i05.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern xunit.core {}
.assembly extern mscorlib { auto }
.assembly extern TestLibrary {}

.assembly 'mcc_i05' {}

Expand All @@ -23,6 +24,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] valuetype MCCTest.VType0 res,
Expand Down Expand Up @@ -64,7 +78,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/mcc/interop/mcc_i05.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<Compile Include="mcc_i05.il ..\common\common.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i06.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern xunit.core {}
.assembly extern mscorlib { auto }
.assembly extern TestLibrary {}

.assembly 'mcc_i06' {}

Expand Down Expand Up @@ -62,6 +63,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] class MCCTest.MyClass me,
Expand All @@ -84,7 +98,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/mcc/interop/mcc_i06.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<Compile Include="mcc_i06.il ..\common\common.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i07.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern xunit.core {}
.assembly extern mscorlib { auto }
.assembly extern TestLibrary {}

.assembly 'mcc_i07' {}

Expand Down Expand Up @@ -66,6 +67,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] class MCCTest.MyClass me,
Expand All @@ -88,7 +102,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/mcc/interop/mcc_i07.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<Compile Include="mcc_i07.il ..\common\common.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
16 changes: 15 additions & 1 deletion src/tests/JIT/jit64/mcc/interop/mcc_i10.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

.assembly extern mscorlib {}
.assembly extern xunit.core {}
.assembly extern TestLibrary {}
.assembly 'mcc_i10' {}


Expand All @@ -21,6 +22,19 @@
01 00 00 00
)
.entrypoint
.maxstack 1
call bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
brtrue.s DoTest
ldc.i4 100
ret

DoTest:
call int32 MCCTest.MyClass::Test()
ret
}

.method public static int32 Test()
{
.maxstack 64
.locals init (
[0] valuetype MCCTest.VType1 res,
Expand Down Expand Up @@ -65,7 +79,7 @@

ldloc.s rc
ret
} // end of method MyClass::Main
} // end of method MyClass::Test

} // end of class MyClass

Expand Down
Loading