From 2fcb045242bfdf96fdc3dbfc847847ed14ebebc1 Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Tue, 8 Nov 2011 10:11:07 +1100 Subject: [PATCH] gotest: don't run examples that have no expected output R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5364041 --- src/cmd/gotest/doc.go | 1 + src/cmd/gotest/gotest.go | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cmd/gotest/doc.go b/src/cmd/gotest/doc.go index aedc55f11e3..c0a972af8c9 100644 --- a/src/cmd/gotest/doc.go +++ b/src/cmd/gotest/doc.go @@ -37,6 +37,7 @@ os.Stdout and os.Stderr is compared against their doc comment. Multiple example functions may be provided for a given name XXX if they are discriminated by a distinct suffix starting with "_", such as ExampleXXX_2. +Example functions without doc comments are compiled but not executed. See the documentation of the testing package for more information. diff --git a/src/cmd/gotest/gotest.go b/src/cmd/gotest/gotest.go index 9a4d2e916d1..e8e2ec892f1 100644 --- a/src/cmd/gotest/gotest.go +++ b/src/cmd/gotest/gotest.go @@ -231,9 +231,14 @@ func getTestNames() { } else if isTest(name, "Benchmark") { f.benchmarks = append(f.benchmarks, name) } else if isTest(name, "Example") { + output := doc.CommentText(n.Doc) + if output == "" { + // Don't run examples with no output. + continue + } f.examples = append(f.examples, example{ name: name, - output: doc.CommentText(n.Doc), + output: output, }) } // TODO: worth checking the signature? Probably not. @@ -372,7 +377,7 @@ func writeTestmainGo() { insideTests := false for _, f := range files { //println(f.name, f.pkg) - if len(f.tests) == 0 && len(f.benchmarks) == 0 { + if len(f.tests) == 0 && len(f.benchmarks) == 0 && len(f.examples) == 0 { continue } if isOutsideTest(f.pkg) {