Address timeouts in merged test groups (#84193)

See #68529 for theories. Should solve the first timeouts in #83961 (baseservices/threading), Directed_1, Regression_1, and Regression_2 by marking tests as RequiresProcessIsolation. Adds striping to Regression_1, Regression_4, threading_group1.
dotnet · Apr 1, 2023 · c6adf4c · c6adf4c
1 parent f8bd9d2
commit c6adf4c
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 3 deletions.
diff --git a/src/tests/JIT/Directed/lifetime/lifetime1.csproj b/src/tests/JIT/Directed/lifetime/lifetime1.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/lifetime/lifetime2.csproj b/src/tests/JIT/Directed/lifetime/lifetime2.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Needed for JitOptimizationSensitive -->
+    <!-- Needed for JitOptimizationSensitive, GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.ilproj b/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <!-- Needed for CLRTestTargetUnsupported -->
+    <!-- Needed for CLRTestTargetUnsupported, GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj b/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_4781/Runtime_4781.csproj b/src/tests/JIT/Regression/JitBlue/Runtime_4781/Runtime_4781.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>

diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_4781/Runtime_4781_1.csproj b/src/tests/JIT/Regression/JitBlue/Runtime_4781/Runtime_4781_1.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Needed for GCStressIncompatible -->
+    <!-- Needed for GCStressIncompatible, GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/Regression_1.csproj b/src/tests/JIT/Regression/Regression_1.csproj
@@ -1,4 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NumberOfStripesToUseInStress>10</NumberOfStripesToUseInStress>
+  </PropertyGroup>
   <ItemGroup>
     <MergedWrapperProjectReference Include="CLR-x86-*/**/*.??proj" />
     <MergedWrapperProjectReference Remove="*/**/*_d.??proj" />

diff --git a/src/tests/JIT/Regression/Regression_4.csproj b/src/tests/JIT/Regression/Regression_4.csproj
@@ -1,4 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NumberOfStripesToUseInStress>10</NumberOfStripesToUseInStress>
+  </PropertyGroup>
   <ItemGroup>
     <MergedWrapperProjectReference Include="VS-ia64-JIT/**/*.??proj" />
     <MergedWrapperProjectReference Remove="*/**/*_d.??proj" />

diff --git a/src/tests/baseservices/threading/regressions/30032/30032.csproj b/src/tests/baseservices/threading/regressions/30032/30032.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for GC.WaitForPendingFinalizers -->
+    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/tests/baseservices/threading/threading_group1.csproj b/src/tests/baseservices/threading/threading_group1.csproj
@@ -1,4 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NumberOfStripesToUseInStress>10</NumberOfStripesToUseInStress>
+  </PropertyGroup>
   <ItemGroup>
     <MergedWrapperProjectReference Include="commitstackonlyasneeded/**/*.??proj" />
     <MergedWrapperProjectReference Include="coverage/**/*.??proj" />