Skip to content

Remove legacy XUnitWrapper test tree infrastructure #123110

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 6 commits into from
Jan 30, 2026
Merged

Remove legacy XUnitWrapper test tree infrastructure #123110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64e55d6
Add mechanism to run a test tree built with BuildAllTestsAsStandlone …
jkoritzinsky Jan 12, 2026
69747b3
When explicitly built as standalone, build a merged test runner as a …
jkoritzinsky Jan 13, 2026
6322dd0
Fix standalone test reporting
jkoritzinsky Jan 13, 2026
fd19451
Remove legacy test runner infrastructure from build scripts and helix…
jkoritzinsky Jan 13, 2026
7caa797
Update src/tests/Common/tests.targets
jkoritzinsky Jan 13, 2026
791ef2a
Merge branch 'main' into legacy-test-runner-cleanup
jkoritzinsky Jan 15, 2026
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
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/runtimes/build-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
displayName: Disk Usage before Build

# Build managed test components
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testFilterArg) ci /p:TargetOS=AnyOS
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testFilterArg) ci /p:TargetOS=AnyOS
displayName: Build managed test components

- ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}:
Expand Down
6 changes: 0 additions & 6 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,6 @@ jobs:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) copynativeonly $(logRootNameArg)Native $(testFilterArg) $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(priorityArg) $(librariesOverrideArg) $(codeFlowEnforcementArg)
displayName: Copy native test components to test output folder


# Generate test wrappers. This is the step that examines issues.targets to exclude tests.
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) buildtestwrappersonly $(logRootNameArg)Wrappers $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) $(runtimeVariantArg)
displayName: Generate test wrappers


# Compose the Core_Root folder containing all artifacts needed for running
# CoreCLR tests. This step also compiles the framework using Crossgen2
# in ReadyToRun jobs.
Expand Down
4 changes: 0 additions & 4 deletions src/tests/Common/CLRTest.CrossGen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
mkdir IL-CG2
cp ./*.dll IL-CG2/
rm IL-CG2/composite-r2r.* 2>/dev/null
rm IL-CG2/Coreclr.TestWrapper.dll 2>/dev/null
rm IL-CG2/*.XUnitWrapper.dll 2>/dev/null

if [ ! -z ${CompositeBuildMode+x} ]%3B then
# HACK: copy native shared shim libraries. Not needed on Windows.
Expand Down Expand Up @@ -254,8 +252,6 @@ if defined RunCrossGen2 (
mkdir IL-CG2
copy *.dll IL-CG2\
del IL-CG2\composite-r2r.* 2>nul
del IL-CG2\Coreclr.TestWrapper.dll 2>nul
del IL-CG2\*.XUnitWrapper.dll 2>nul

if defined CompositeBuildMode (
set ExtraCrossGen2Args=!ExtraCrossGen2Args! --composite
Expand Down
3 changes: 1 addition & 2 deletions src/tests/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="AssertExtensions.cs" />
<Compile Include="CoreclrTestWrapperLib.cs" />
<Compile Include="Generator.cs" />
<Compile Include="Logging.cs" />
<Compile Include="TestFramework.cs" />
Expand All @@ -19,8 +20,6 @@
<Compile Include="Vectors.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Coreclr.TestWrapper\CoreclrTestWrapperLib.cs" Link="CoreclrTestWrapperLib.cs" />
<Compile Include="..\Coreclr.TestWrapper\MobileAppHandler.cs" Link="MobileAppHandler.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading