Skip to content

Consolidate some jit64 tests into less assemblies #120992

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
jkoritzinsky merged 24 commits into from
Oct 24, 2025
Merged

Consolidate some jit64 tests into less assemblies #120992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7640431
Move GCStressIncompatible into source
jkoritzinsky Oct 21, 2025
302a97f
Move CLRTestPriority into source and remove RequiresProcessIsolation …
jkoritzinsky Oct 21, 2025
ca5fb06
Merge VolatileTest tests into one assembly
jkoritzinsky Oct 21, 2025
eadfac3
Consolidate all the valuetypes tests into one project
jkoritzinsky Oct 21, 2025
1267534
Use Assert.Throws in overflow test
jkoritzinsky Oct 21, 2025
1557ded
Consolidate rtchecks test into one project
jkoritzinsky Oct 22, 2025
2afed82
We don't need a separate valuetypes.csproj project if jit64_4 covers …
jkoritzinsky Oct 22, 2025
66fad30
Switch mcc tests to use attributes for configuration
jkoritzinsky Oct 22, 2025
59f47cd
Merge all of the mcc tests into one IL assembly. Removes 86 ilproj pr…
jkoritzinsky Oct 22, 2025
e378648
mcc interop consolidation: aggregated project and Program.Main runner…
jkoritzinsky Oct 22, 2025
9c8e96f
Fix assembly and module names
jkoritzinsky Oct 22, 2025
7205342
Skip the merged assembly on Windows for now (in case someone tries to…
jkoritzinsky Oct 22, 2025
517c02d
Change glob reference to a regular project ref
jkoritzinsky Oct 22, 2025
29c5b26
Delete duplicate tests
jkoritzinsky Oct 22, 2025
475e939
Remove calling convention stdcall. It's not necessary.
jkoritzinsky Oct 22, 2025
297cf95
Cleanup hfa CMake
jkoritzinsky Oct 22, 2025
ca41086
Standardize CMakeLists.txt casing
jkoritzinsky Oct 22, 2025
0ff6530
Unify structdef.cs
jkoritzinsky Oct 24, 2025
da52498
Mark a test as MonoAotIncompatible
jkoritzinsky Oct 24, 2025
08c69b6
Merge branch 'main' of https://github.com/dotnet/runtime into test-merge
jkoritzinsky Oct 24, 2025
3f466a5
Fix extra newlines
jkoritzinsky Oct 24, 2025
d95d59a
Remove duplicate.txt extension
jkoritzinsky Oct 24, 2025
bb815bb
Move hugeexpr1 back to RPI
jkoritzinsky Oct 24, 2025
c783cd5
Use PlatformDetection API that was just introduced
jkoritzinsky Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions docs/workflow/testing/coreclr/testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,12 @@ Some tests need to be run in their own process as they interact with global proc

Sometimes you may want to run a test with the least amount of code before actually executing the test. In addition to the merged test runner, we have another runner mode known as the "Standalone" runner. This runner is used by default in tests that require process isolation. This runner consists of a simple `try-catch` around executing each test sequentially, with no test results file or runtime test filtering.

If you have a merged test runner that you want to run in the standalone mode, you can pass `-p:BuildAsStandalone=true` when building the merged test runner. This will build a project that runs all tests sequentially with no filtering or result file support.

To filter tests on a merged test runner built as standalone, you can set the `TestFilter` property, like so: `./dotnet.sh build -c Checked src/tests/path/to/test.csproj -p:TestFilter=SubstringOfFullyQualifiedTestName`. This mechanism supports the same filtering as the runtime test filtering. Using this mechanism will allow you to skip individual test cases at build time instead of at runtime.

The `TestFilter` property can also be used on a runner assembly in the merged runner mode.

#### Building all tests with the Standalone Runner

If you wish to use the Standalone runner described in the [previous section](#the-standalone-test-runner-and-build-time-test-filtering), you can set the `BuildAllTestsAsStandalone` environment variable to `true` when invoking the `./src/tests/build.sh` or `./src/tests/build.cmd` scripts (for example, `export BuildAllTestsAsStandalone=true` or `set BuildAllTestsAsStandalone=true`). This will build all tests that are not directly in a merged test runner's project as separate executable tests and build only the tests that are compiled into the runner directly. If a runner has no tests that are built directly into the runner, then it will be excluded.
Expand Down
8 changes: 4 additions & 4 deletions src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ project(hfa_interop)


add_library(hfa_simple_f32_native_cpp SHARED hfa_native.cpp)
SET_TARGET_PROPERTIES(hfa_simple_f32_native_cpp PROPERTIES COMPILE_FLAGS "-c -DSIMPLE_HFA -DFLOAT32")
target_compile_definitions(hfa_simple_f32_native_cpp PRIVATE SIMPLE_HFA FLOAT32)

add_library(hfa_simple_f64_native_cpp SHARED hfa_native.cpp)
SET_TARGET_PROPERTIES(hfa_simple_f64_native_cpp PROPERTIES COMPILE_FLAGS "-c -DSIMPLE_HFA -DFLOAT64")
target_compile_definitions(hfa_simple_f64_native_cpp PRIVATE SIMPLE_HFA FLOAT64)

add_library(hfa_nested_f32_native_cpp SHARED hfa_native.cpp)
SET_TARGET_PROPERTIES(hfa_nested_f32_native_cpp PROPERTIES COMPILE_FLAGS "-c -DNESTED_HFA -DFLOAT32")
target_compile_definitions(hfa_nested_f32_native_cpp PRIVATE NESTED_HFA FLOAT32)

add_library(hfa_nested_f64_native_cpp SHARED hfa_native.cpp)
SET_TARGET_PROPERTIES(hfa_nested_f64_native_cpp PROPERTIES COMPILE_FLAGS "-c -DNESTED_HFA -DFLOAT64")
target_compile_definitions(hfa_nested_f64_native_cpp PRIVATE NESTED_HFA FLOAT64)
502 changes: 251 additions & 251 deletions src/tests/JIT/jit64/hfa/main/dll/hfa_interop.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="hfa_nested_f64_common.csproj" />
<CMakeProjectReference Include="CMakelists.txt" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
18 changes: 0 additions & 18 deletions src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
18 changes: 0 additions & 18 deletions src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
18 changes: 0 additions & 18 deletions src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
18 changes: 0 additions & 18 deletions src/tests/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/tests/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_managed.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f64_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_managed.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_nested_f32_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_managed.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f64_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_managed.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\dll\common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
<ProjectReference Include="..\dll\hfa_simple_f32_interop_cpp.csproj" />
<CMakeProjectReference Include="..\dll\CMakelists.txt" />
<CMakeProjectReference Include="..\dll\CMakeLists.txt" />
</ItemGroup>
</Project>
18 changes: 0 additions & 18 deletions src/tests/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
View file
Open in desktop

This file was deleted.

Loading