diff --git a/src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs b/src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs index 61f4488f0aaa3e..f6b0884719eba1 100644 --- a/src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs +++ b/src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs @@ -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"; @@ -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"; diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs index 64521bd4670c53..424a04fb39ec63 100644 --- a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs +++ b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs @@ -769,7 +769,7 @@ private static IEnumerable GetTestMethodInfosForMethod(IMethodSymbol break; } case "Xunit.OuterLoopAttribute": - if (options.GlobalOptions.Priority() == 0) + if (options.GlobalOptions.CLRTestPriorityToBuild() == 0) { if (filterAttribute.AttributeConstructor!.Parameters.Length < 2) { diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props index fca5c164fba2e1..ec37dd9be0e252 100644 --- a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props +++ b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props @@ -4,7 +4,7 @@ - + diff --git a/src/tests/JIT/Methodical/Methodical_others.csproj b/src/tests/JIT/Methodical/Methodical_others.csproj index dc1a42a69c7be1..2a72d82d07d8a6 100644 --- a/src/tests/JIT/Methodical/Methodical_others.csproj +++ b/src/tests/JIT/Methodical/Methodical_others.csproj @@ -16,6 +16,7 @@ + @@ -89,4 +90,4 @@ - \ No newline at end of file + diff --git a/src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj b/src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj index e63ee8ab4ea44d..bbef198ccc7980 100644 --- a/src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj +++ b/src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj @@ -13,5 +13,6 @@ + diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.cs b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.cs index 90efa84fa823fc..9fc71744f398a7 100644 --- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.cs +++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.cs @@ -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"); diff --git a/src/tests/JIT/Regression/Dev11/External/dev11_145295/ilpart.il b/src/tests/JIT/Regression/Dev11/External/dev11_145295/ilpart.il index c656f0bc6eda5b..6f3ea7e6125112 100644 --- a/src/tests/JIT/Regression/Dev11/External/dev11_145295/ilpart.il +++ b/src/tests/JIT/Regression/Dev11/External/dev11_145295/ilpart.il @@ -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 } @@ -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 } @@ -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 } diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_64883/Runtime_64883.cs b/src/tests/JIT/Regression/JitBlue/Runtime_64883/Runtime_64883.cs index 98d0512516060c..381f1c0f2609c1 100644 --- a/src/tests/JIT/Regression/JitBlue/Runtime_64883/Runtime_64883.cs +++ b/src/tests/JIT/Regression/JitBlue/Runtime_64883/Runtime_64883.cs @@ -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; @@ -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]); } @@ -42,7 +42,7 @@ public static void MainT() uint vr6 = s_29; } #pragma warning restore xUnit1013 - + private class CollectibleALC : AssemblyLoadContext { public CollectibleALC() : base(true) diff --git a/src/tests/JIT/jit64/opt/cse/hugeexpr1.csproj b/src/tests/JIT/jit64/opt/cse/hugeexpr1.csproj index 46055c653b927c..46a4fb61088843 100644 --- a/src/tests/JIT/jit64/opt/cse/hugeexpr1.csproj +++ b/src/tests/JIT/jit64/opt/cse/hugeexpr1.csproj @@ -14,5 +14,6 @@ + diff --git a/src/tests/JIT/superpmi/superpmicollect.csproj b/src/tests/JIT/superpmi/superpmicollect.csproj index 63a0974cdb1976..60f261d79d949f 100644 --- a/src/tests/JIT/superpmi/superpmicollect.csproj +++ b/src/tests/JIT/superpmi/superpmicollect.csproj @@ -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" /> Build @@ -65,7 +68,7 @@ - +