diff options
Diffstat (limited to 'src/runtime/pprof')
| -rw-r--r-- | src/runtime/pprof/pprof_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go index 5477d9ed26..01d3b0aa4b 100644 --- a/src/runtime/pprof/pprof_test.go +++ b/src/runtime/pprof/pprof_test.go @@ -1577,8 +1577,8 @@ func TestGoroutineProfileConcurrency(t *testing.T) { return strings.Count(s, "\truntime/pprof.runtime_goroutineProfileWithLabels+") } - includesFinalizer := func(s string) bool { - return strings.Contains(s, "runtime.runFinalizersAndCleanups") + includesFinalizerOrCleanup := func(s string) bool { + return strings.Contains(s, "runtime.runFinalizers") || strings.Contains(s, "runtime.runCleanups") } // Concurrent calls to the goroutine profiler should not trigger data races @@ -1616,8 +1616,8 @@ func TestGoroutineProfileConcurrency(t *testing.T) { var w strings.Builder goroutineProf.WriteTo(&w, 1) prof := w.String() - if includesFinalizer(prof) { - t.Errorf("profile includes finalizer (but finalizer should be marked as system):\n%s", prof) + if includesFinalizerOrCleanup(prof) { + t.Errorf("profile includes finalizer or cleanup (but should be marked as system):\n%s", prof) } }) @@ -1648,7 +1648,7 @@ func TestGoroutineProfileConcurrency(t *testing.T) { var w strings.Builder goroutineProf.WriteTo(&w, 1) prof := w.String() - if !includesFinalizer(prof) { + if !includesFinalizerOrCleanup(prof) { t.Errorf("profile does not include finalizer (and it should be marked as user):\n%s", prof) } }) @@ -2065,7 +2065,7 @@ func TestLabelSystemstack(t *testing.T) { // which part of the function they are // at. mayBeLabeled = true - case "runtime.bgsweep", "runtime.bgscavenge", "runtime.forcegchelper", "runtime.gcBgMarkWorker", "runtime.runFinalizersAndCleanups", "runtime.sysmon": + case "runtime.bgsweep", "runtime.bgscavenge", "runtime.forcegchelper", "runtime.gcBgMarkWorker", "runtime.runFinalizers", "runtime.runCleanups", "runtime.sysmon": // Runtime system goroutines or threads // (such as those identified by // runtime.isSystemGoroutine). These |