Skip to content

Restore correct outerloop priority tracking and test execution #123112

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 4 commits into from
Jan 14, 2026
Merged

Restore correct outerloop priority tracking and test execution #123112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53131c1
Restore correct outerloop priority tracking
jkoritzinsky Jan 13, 2026
73058f7
Add missing project reference.
jkoritzinsky Jan 13, 2026
81e071f
Add another test library project reference
jkoritzinsky Jan 13, 2026
051aa2b
Fix various test failures
jkoritzinsky Jan 14, 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
4 changes: 2 additions & 2 deletions src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public static class OptionsHelper
{
private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
private const string PriorityOption = "build_property.Priority";
private const string CLRTestPriorityToBuildOption = "build_property.CLRTestPriorityToBuild";
private const string TestBuildModeOption = "build_property.TestBuildMode";
private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
Expand All @@ -35,7 +35,7 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

internal static bool IsMergedTestRunnerAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsMergedTestRunnerAssemblyOption);

internal static int? Priority(this AnalyzerConfigOptions options) => options.GetIntOption(PriorityOption);
internal static int? CLRTestPriorityToBuild(this AnalyzerConfigOptions options) => options.GetIntOption(CLRTestPriorityToBuildOption);

internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

Expand Down
2 changes: 1 addition & 1 deletion src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ private static IEnumerable<ITestInfo> GetTestMethodInfosForMethod(IMethodSymbol
break;
}
case "Xunit.OuterLoopAttribute":
if (options.GlobalOptions.Priority() == 0)
if (options.GlobalOptions.CLRTestPriorityToBuild() == 0)
{
if (filterAttribute.AttributeConstructor!.Parameters.Length < 2)
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<CompilerVisibleProperty Include="RuntimeFlavor" />
<CompilerVisibleProperty Include="TargetOS" />
<CompilerVisibleProperty Include="TargetArchitecture" />
<CompilerVisibleProperty Include="Priority" />
<CompilerVisibleProperty Include="CLRTestPriorityToBuild" />
<CompilerVisibleProperty Include="TestBuildMode" />
<!-- Properties that influence test harness generation -->
<CompilerVisibleProperty Include="InMergedTestDirectory" />
Expand Down
3 changes: 2 additions & 1 deletion src/tests/JIT/Methodical/Methodical_others.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<ProjectReference Include="flowgraph/dev10_bug679008/helper.ilproj" />
<MergedWrapperProjectReference Remove="flowgraph/dev10_bug679008/helper.ilproj" />
<CMakeProjectReference Include="gc_poll/CMakeLists.txt" />
<CMakeProjectReference Include="structs/systemvbringup/CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<Compile Include="Arrays\misc\IndexingSideEffects.cs" />
Expand Down Expand Up @@ -89,4 +90,4 @@
<Compile Include="tailcall_v4\delegateParamCallTarget.cs" />
</ItemGroup>
<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
</Project>
</Project>
1 change: 1 addition & 0 deletions src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="thread-race.cs" />
<ProjectReference Include="$(TestLibraryProjectPath)" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static int TestEntryPoint()
ret = 101;
}

Type t = Type.GetType("Test.C1`1[[System.Int64, mscorlib, Version=0.0.0.0, Culture=neutral ]], c1, Version=0.0.0.0, Culture=neutral");
Type t = Type.GetType("b423721.C1`1[[System.Int64, mscorlib, Version=0.0.0.0, Culture=neutral ]], c1, Version=0.0.0.0, Culture=neutral");
if (t == null)
{
Console.WriteLine("FAIL: Could not get Type C1`1[[System.Int64, mscorlib, Version=0.0.0.0, Culture=neutral ]], c1, Version=0.0.0.0, Culture=neutral");
Expand Down
18 changes: 9 additions & 9 deletions src/tests/JIT/Regression/Dev11/External/dev11_145295/ilpart.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,21 @@
endfinally

RUN_CALLOUT_3:
call void [CSharpPart_145295]Test.Helpers::Callout3()
call void [CSharpPart_145295]dev11_145295.Helpers::Callout3()
endfinally

RUN_CALLOUT_4:
ldc.i4 4
stloc computedValue
call void [CSharpPart_145295]Test.Helpers::Callout4()
call void [CSharpPart_145295]dev11_145295.Helpers::Callout4()
endfinally

RUN_CALLOUT_5:
call void [CSharpPart_145295]Test.Helpers::Callout5()
call void [CSharpPart_145295]dev11_145295.Helpers::Callout5()
endfinally

RUN_CALLOUT_6:
call void [CSharpPart_145295]Test.Helpers::Callout6()
call void [CSharpPart_145295]dev11_145295.Helpers::Callout6()
endfinally

}
Expand Down Expand Up @@ -135,7 +135,7 @@
.try
{

call void [CSharpPart_145295]Test.Helpers::Throw()
call void [CSharpPart_145295]dev11_145295.Helpers::Throw()
leave END_OF_METHOD_BODY

}
Expand Down Expand Up @@ -181,19 +181,19 @@
endfinally

RUN_CALLOUT_3:
call void [CSharpPart_145295]Test.Helpers::Callout3()
call void [CSharpPart_145295]dev11_145295.Helpers::Callout3()
endfinally

RUN_CALLOUT_4:
call void [CSharpPart_145295]Test.Helpers::Callout4()
call void [CSharpPart_145295]dev11_145295.Helpers::Callout4()
endfinally

RUN_CALLOUT_5:
call void [CSharpPart_145295]Test.Helpers::Callout5()
call void [CSharpPart_145295]dev11_145295.Helpers::Callout5()
endfinally

RUN_CALLOUT_6:
call void [CSharpPart_145295]Test.Helpers::Callout6()
call void [CSharpPart_145295]dev11_145295.Helpers::Callout6()
endfinally

}
Expand Down
8 changes: 4 additions & 4 deletions src/tests/JIT/Regression/JitBlue/Runtime_64883/Runtime_64883.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// Reduced from 168.4 KiB to 0.2 KiB in 00:05:13
// Hits JIT assert in Release:
// Assertion failed '!"Write to unaliased local overlaps outstanding read"' in 'Program:Main(Fuzzlyn.ExecutionServer.IRuntime)' during 'Rationalize IR' (IL size 26)
//
//
// File: D:\a\_work\1\s\src\coreclr\jit\lir.cpp Line: 1397
//
//

namespace Runtime_64883;

Expand All @@ -29,7 +29,7 @@ public static void TestEntryPoint()
// This needs an ALC because the "static access" helper is different in ALCs.
CollectibleALC alc = new CollectibleALC();
Assembly asm = alc.LoadFromAssemblyPath(Assembly.GetExecutingAssembly().Location);
MethodInfo mi = asm.GetType(nameof(Runtime_64883)).GetMethod(nameof(MainT));
MethodInfo mi = asm.GetType($"{nameof(Runtime_64883)}.{nameof(Runtime_64883)}").GetMethod(nameof(MainT));
mi.Invoke(null, new object[0]);
}

Expand All @@ -42,7 +42,7 @@ public static void MainT()
uint vr6 = s_29;
}
#pragma warning restore xUnit1013

private class CollectibleALC : AssemblyLoadContext
{
public CollectibleALC() : base(true)
Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/opt/cse/hugeexpr1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="hugeexpr1.cs" />
<ProjectReference Include="$(TestLibraryProjectPath)" />
</ItemGroup>
</Project>
7 changes: 5 additions & 2 deletions src/tests/JIT/superpmi/superpmicollect.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
<_SpmiTestProjects Include="..\Performance\CodeQuality\Bytemark\Bytemark.csproj" />
<_SpmiTestProjects Include="..\Performance\CodeQuality\Roslyn\CscBench.csproj" />
<_SpmiTestProjects Include="..\Methodical\cctor\xassem\xprecise1_cs_do.csproj" />
<_SpmiTestSupportProjects Include="..\Methodical\cctor\xassem\testlib_xassem.csproj" />

<_SpmiTestProjects Update="@(_SpmiTestProjects)" TestProject="%(FileName)" />

<_SpmiTestSupportProjects Include="..\Methodical\cctor\xassem\testlib_xassem.csproj" TestProject="xprecise1_cs_do" />

<ProjectReference Include="@(_SpmiTestProjects);@(_SpmiTestSupportProjects)">
<Targets>Build</Targets>
Expand Down Expand Up @@ -65,7 +68,7 @@
</ItemGroup>

<Target Name="_CopySpmiTestsToOutput" DependsOnTargets="ResolveProjectReferences" BeforeTargets="AssignTargetPaths">
<Copy SourceFiles="@(_SpmiTest)" DestinationFolder="$([System.IO.Path]::GetDirectoryName('$(OutputPath)'))/$([System.IO.Path]::GetFileName('%(FileName)'))" SkipUnchangedFiles="True" />
<Copy SourceFiles="@(_SpmiTest)" DestinationFolder="$([System.IO.Path]::GetDirectoryName('$(OutputPath)'))/$([System.IO.Path]::GetFileName('%(TestProject)'))" SkipUnchangedFiles="True" />
</Target>

<!-- This target builds the executables and test running scripts for the _SpmiTestProjects
Expand Down
Loading