From 62cbf126287e858e722ef6a339a363428af66795 Mon Sep 17 00:00:00 2001 From: David Mason Date: Fri, 17 Jul 2020 15:34:17 -0700 Subject: [PATCH 1/3] Revert "Disable eventpipe/gcdump test against #39361 (#39362)" This reverts commit 36a9444f7fc342476a65ff03c5c0461c9f5dc029. --- src/coreclr/tests/issues.targets | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index e19d521e42a47f..eb1f6be60e89f4 100644 --- a/src/coreclr/tests/issues.targets +++ b/src/coreclr/tests/issues.targets @@ -5,9 +5,6 @@ https://github.com/dotnet/runtime/issues/11204 - - https://github.com/dotnet/runtime/issues/39361 - timeout From e168fc45f52df26159fa9adc9b16c8e223597923 Mon Sep 17 00:00:00 2001 From: David Mason Date: Fri, 17 Jul 2020 15:35:53 -0700 Subject: [PATCH 2/3] lower gcdump thresholds --- src/tests/tracing/eventpipe/gcdump/gcdump.cs | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/tests/tracing/eventpipe/gcdump/gcdump.cs b/src/tests/tracing/eventpipe/gcdump/gcdump.cs index 1ee96f83781c71..f500b86a1114ee 100644 --- 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 resillient 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; } From 5f74e23af76c49ccc0215bfc71a7d23ebc82fbd6 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Fri, 17 Jul 2020 16:00:50 -0700 Subject: [PATCH 3/3] Update src/tests/tracing/eventpipe/gcdump/gcdump.cs --- src/tests/tracing/eventpipe/gcdump/gcdump.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/tracing/eventpipe/gcdump/gcdump.cs b/src/tests/tracing/eventpipe/gcdump/gcdump.cs index f500b86a1114ee..963544d9e308c9 100644 --- a/src/tests/tracing/eventpipe/gcdump/gcdump.cs +++ b/src/tests/tracing/eventpipe/gcdump/gcdump.cs @@ -82,7 +82,7 @@ public static int Main(string[] args) return () => { - // Hopefully it is low enough to be resillient to changes in the runtime + // 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. @@ -106,4 +106,4 @@ public static int Main(string[] args) }; }; } -} \ No newline at end of file +}