From 89ab2a9cf713ab7f221dd2bd0b4cb540b360eafc Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Tue, 9 Apr 2024 10:40:37 -0700
Subject: [PATCH] Disable binder tracing test under gcstress (#100798)

---
 .../Loader/binding/tracing/BinderTracingTest.Basic.csproj   | 6 ------
 .../binding/tracing/BinderTracingTest.ResolutionFlow.csproj | 5 -----
 src/tests/Loader/binding/tracing/BinderTracingTest.cs       | 3 ---
 src/tests/Loader/binding/tracing/BinderTracingTest.targets  | 6 ++++++
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/tests/Loader/binding/tracing/BinderTracingTest.Basic.csproj b/src/tests/Loader/binding/tracing/BinderTracingTest.Basic.csproj
index aea7260ca1a9a..c5b8d00433f91 100644
--- a/src/tests/Loader/binding/tracing/BinderTracingTest.Basic.csproj
+++ b/src/tests/Loader/binding/tracing/BinderTracingTest.Basic.csproj
@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <!-- TestAssemblyLoadContext.Load called from the finalizer -->
-    <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
-    <!-- Dynamic assembly loads -->
-    <NativeAotIncompatible>true</NativeAotIncompatible>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="BinderTracingTest.Basic.cs" />
     <Compile Include="BinderTracingTest.DefaultProbing.cs" />
diff --git a/src/tests/Loader/binding/tracing/BinderTracingTest.ResolutionFlow.csproj b/src/tests/Loader/binding/tracing/BinderTracingTest.ResolutionFlow.csproj
index 07f4907e396c9..7d3485339fd97 100644
--- a/src/tests/Loader/binding/tracing/BinderTracingTest.ResolutionFlow.csproj
+++ b/src/tests/Loader/binding/tracing/BinderTracingTest.ResolutionFlow.csproj
@@ -1,10 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Test creates non-collectible AssemblyLoadContext -->
-    <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
-    <!-- Dynamic assembly loads -->
-    <NativeAotIncompatible>true</NativeAotIncompatible>
-    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <IlasmRoundTripIncompatible>true</IlasmRoundTripIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/Loader/binding/tracing/BinderTracingTest.cs b/src/tests/Loader/binding/tracing/BinderTracingTest.cs
index a48e3ab419dde..2f246ee8eeb07 100644
--- a/src/tests/Loader/binding/tracing/BinderTracingTest.cs
+++ b/src/tests/Loader/binding/tracing/BinderTracingTest.cs
@@ -85,9 +85,6 @@ public static bool RunAllTests()
             foreach (var method in methods)
             {
                 BinderTestAttribute attribute = method.GetCustomAttribute<BinderTestAttribute>();
-                if (attribute.Isolate && Environment.GetEnvironmentVariable("DOTNET_GCStress") != null)
-                    continue;
-
                 bool success = attribute.Isolate
                     ? RunTestInSeparateProcess(method)
                     : RunSingleTest(method);
diff --git a/src/tests/Loader/binding/tracing/BinderTracingTest.targets b/src/tests/Loader/binding/tracing/BinderTracingTest.targets
index 5851e914132d7..c2165d7c89e60 100644
--- a/src/tests/Loader/binding/tracing/BinderTracingTest.targets
+++ b/src/tests/Loader/binding/tracing/BinderTracingTest.targets
@@ -4,6 +4,12 @@
     <!-- Requires explicit Main as it implements command-line parameters for local testing purposes. -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
+    <!-- Test creates non-collectible AssemblyLoadContext -->
+    <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
+    <!-- Dynamic assembly loads -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
+    <!-- Tracing tests routinely time out with gcstress -->
+    <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BinderTracingTest.cs" />