diff options
Diffstat (limited to 'src/testing')
| -rw-r--r-- | src/testing/fuzz.go | 3 | ||||
| -rw-r--r-- | src/testing/testing.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/testing/fuzz.go b/src/testing/fuzz.go index fc1212b142..55e5397193 100644 --- a/src/testing/fuzz.go +++ b/src/testing/fuzz.go @@ -491,13 +491,14 @@ type fuzzContext struct { // runFuzzTargets runs the fuzz targets matching the pattern for -run. This will // only run the f.Fuzz function for each seed corpus without using the fuzzing // engine to generate or mutate inputs. -func runFuzzTargets(deps testDeps, fuzzTargets []InternalFuzzTarget) (ran, ok bool) { +func runFuzzTargets(deps testDeps, fuzzTargets []InternalFuzzTarget, deadline time.Time) (ran, ok bool) { ok = true if len(fuzzTargets) == 0 || *isFuzzWorker { return ran, ok } m := newMatcher(deps.MatchString, *match, "-test.run") tctx := newTestContext(*parallel, m) + tctx.deadline = deadline fctx := &fuzzContext{ importPath: deps.ImportPath, readCorpus: deps.ReadCorpus, diff --git a/src/testing/testing.go b/src/testing/testing.go index fa92dbb005..581271e748 100644 --- a/src/testing/testing.go +++ b/src/testing/testing.go @@ -1595,7 +1595,7 @@ func (m *M) Run() (code int) { deadline := m.startAlarm() haveExamples = len(m.examples) > 0 testRan, testOk := runTests(m.deps.MatchString, m.tests, deadline) - fuzzTargetsRan, fuzzTargetsOk := runFuzzTargets(m.deps, m.fuzzTargets) + fuzzTargetsRan, fuzzTargetsOk := runFuzzTargets(m.deps, m.fuzzTargets, deadline) exampleRan, exampleOk := runExamples(m.deps.MatchString, m.examples) m.stopAlarm() if !testRan && !exampleRan && !fuzzTargetsRan && *matchBenchmarks == "" && *matchFuzz == "" { |