diff options
Diffstat (limited to 'src/testing/testing.go')
| -rw-r--r-- | src/testing/testing.go | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/testing/testing.go b/src/testing/testing.go index b3f4b4da58..57ac580051 100644 --- a/src/testing/testing.go +++ b/src/testing/testing.go @@ -495,7 +495,6 @@ type common struct { chatty *chattyPrinter // A copy of chattyPrinter, if the chatty flag is set. bench bool // Whether the current test is a benchmark. - fuzzing bool // Whether the current test is a fuzzing target. hasSub int32 // Written atomically. raceErrors int // Number of races detected during test. runner string // Function name of tRunner running the test. @@ -697,17 +696,6 @@ func (c *common) flushToParent(testName, format string, args ...interface{}) { } } -// isFuzzing returns whether the current context, or any of the parent contexts, -// are a fuzzing target -func (c *common) isFuzzing() bool { - for com := c; com != nil; com = com.parent { - if com.fuzzing { - return true - } - } - return false -} - type indenter struct { c *common } @@ -1291,7 +1279,7 @@ func tRunner(t *T, fn func(t *T)) { } } - if err != nil && t.isFuzzing() { + if err != nil && t.context.isFuzzing { prefix := "panic: " if err == errNilPanicOrGoexit { prefix = "" @@ -1457,6 +1445,12 @@ type testContext struct { match *matcher deadline time.Time + // isFuzzing is true in the context used when generating random inputs + // for fuzz targets. isFuzzing is false when running normal tests and + // when running fuzz tests as unit tests (without -fuzz or when -fuzz + // does not match). + isFuzzing bool + mu sync.Mutex // Channel used to signal tests that are ready to be run in parallel. |