]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: only run TestMemStats sanity tests once
authorIan Lance Taylor <iant@golang.org>
Sun, 8 Jul 2018 23:42:33 +0000 (16:42 -0700)
committerIan Lance Taylor <iant@golang.org>
Mon, 9 Jul 2018 17:48:35 +0000 (17:48 +0000)
Fixes #22696

Change-Id: Ibe4628f71d64a2b36b655ea69710a925924b12a3
Reviewed-on: https://go-review.googlesource.com/122586
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
src/runtime/malloc_test.go

index 0bce059f7f7d25cea411ebc5c370fda1a8c84357..e6afc25ea9b72be77a511667620bc0c14dfc2c48 100644 (file)
@@ -19,7 +19,11 @@ import (
        "unsafe"
 )
 
+var testMemStatsCount int
+
 func TestMemStats(t *testing.T) {
+       testMemStatsCount++
+
        // Make sure there's at least one forced GC.
        GC()
 
@@ -35,6 +39,13 @@ func TestMemStats(t *testing.T) {
        }
        le := func(thresh float64) func(interface{}) error {
                return func(x interface{}) error {
+                       // These sanity tests aren't necessarily valid
+                       // with high -test.count values, so only run
+                       // them once.
+                       if testMemStatsCount > 1 {
+                               return nil
+                       }
+
                        if reflect.ValueOf(x).Convert(reflect.TypeOf(thresh)).Float() < thresh {
                                return nil
                        }