Reenable gcdump test (#39555)

lower gcdump thresholds to make test pass on all platforms/architectures
dotnet · Jul 20, 2020 · 0e23ef4 · 0e23ef4
1 parent 9a5ef96
commit 0e23ef4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
@@ -5,9 +5,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/tracing/tracecontrol/tracecontrol/*">
             <Issue>https://github.com/dotnet/runtime/issues/11204</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/gcdump/*">
-            <Issue>https://github.com/dotnet/runtime/issues/39361</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/readytorun/DynamicMethodGCStress/DynamicMethodGCStress/*">
             <Issue>timeout</Issue>
         </ExcludeList>

diff --git a/src/tests/tracing/eventpipe/gcdump/gcdump.cs b/src/tests/tracing/eventpipe/gcdump/gcdump.cs
@@ -82,17 +82,15 @@ public static int Main(string[] args)
 
             return () => 
             {
-                // These values are ~80% (rounded to nice whole numbers) of the values
-                // I saw when writing the test. The idea is that I want to catch
-                // any real deviation in the number of types, but don't want to have
-                // to maintain this test as the number of types varies. (And they will vary due to 
-                // framework code changes). If this test needs any sort of ongoing maintenance
-                // just change all these values to a low number like 10 and move on.
-                if (_bulkTypeCount > 125
-                    && _bulkNodeCount > 600
-                    && _bulkEdgeCount > 850
-                    && _bulkRootEdgeCount > 250
-                    && _bulkRootStaticVarCount > 70)
+                // Hopefully it is low enough to be resilient to changes in the runtime
+                // and high enough to catch issues. There should be between hundreds and thousands
+                // for each, but the number is variable and the point of the test is to verify
+                // that we get any events at all.
+                if (_bulkTypeCount > 50
+                     && _bulkNodeCount > 50
+                     && _bulkEdgeCount > 50
+                     && _bulkRootEdgeCount > 50
+                     && _bulkRootStaticVarCount > 50)
                 {
                     return 100;
                 }
@@ -108,4 +106,4 @@ public static int Main(string[] args)
             };
         };
     }
-}
+}