Commit 7ef97def authored by Rob Pike's avatar Rob Pike

testing: fix references to "gotest"

Fixes #2958.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5650050
parent 9a469e6a
...@@ -16,7 +16,7 @@ var matchBenchmarks = flag.String("test.bench", "", "regular expression to selec ...@@ -16,7 +16,7 @@ var matchBenchmarks = flag.String("test.bench", "", "regular expression to selec
var benchTime = flag.Float64("test.benchtime", 1, "approximate run time for each benchmark, in seconds") var benchTime = flag.Float64("test.benchtime", 1, "approximate run time for each benchmark, in seconds")
// An internal type but exported because it is cross-package; part of the implementation // An internal type but exported because it is cross-package; part of the implementation
// of gotest. // of the "go test" command.
type InternalBenchmark struct { type InternalBenchmark struct {
Name string Name string
F func(b *B) F func(b *B)
...@@ -213,7 +213,7 @@ func (r BenchmarkResult) String() string { ...@@ -213,7 +213,7 @@ func (r BenchmarkResult) String() string {
} }
// An internal function but exported because it is cross-package; part of the implementation // An internal function but exported because it is cross-package; part of the implementation
// of gotest. // of the "go test" command.
func RunBenchmarks(matchString func(pat, str string) (bool, error), benchmarks []InternalBenchmark) { func RunBenchmarks(matchString func(pat, str string) (bool, error), benchmarks []InternalBenchmark) {
// If no flag was specified, don't run benchmarks. // If no flag was specified, don't run benchmarks.
if len(*matchBenchmarks) == 0 { if len(*matchBenchmarks) == 0 {
...@@ -281,7 +281,7 @@ func (b *B) trimOutput() { ...@@ -281,7 +281,7 @@ func (b *B) trimOutput() {
} }
// Benchmark benchmarks a single function. Useful for creating // Benchmark benchmarks a single function. Useful for creating
// custom benchmarks that do not use gotest. // custom benchmarks that do not use the "go test" command.
func Benchmark(f func(b *B)) BenchmarkResult { func Benchmark(f func(b *B)) BenchmarkResult {
b := &B{ b := &B{
common: common{ common: common{
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// //
// Functions of the form // Functions of the form
// func BenchmarkXxx(*testing.B) // func BenchmarkXxx(*testing.B)
// are considered benchmarks, and are executed by gotest when the -test.bench // are considered benchmarks, and are executed by the "go test" command when
// flag is provided. // the -test.bench flag is provided.
// //
// A sample benchmark function looks like this: // A sample benchmark function looks like this:
// func BenchmarkHello(b *testing.B) { // func BenchmarkHello(b *testing.B) {
...@@ -81,7 +81,7 @@ var ( ...@@ -81,7 +81,7 @@ var (
// The short flag requests that tests run more quickly, but its functionality // The short flag requests that tests run more quickly, but its functionality
// is provided by test writers themselves. The testing package is just its // is provided by test writers themselves. The testing package is just its
// home. The all.bash installation script sets it to make installation more // home. The all.bash installation script sets it to make installation more
// efficient, but by default the flag is off so a plain "gotest" will do a // efficient, but by default the flag is off so a plain "go test" will do a
// full test of the package. // full test of the package.
short = flag.Bool("test.short", false, "run smaller test suite to save time") short = flag.Bool("test.short", false, "run smaller test suite to save time")
...@@ -162,7 +162,7 @@ func (c *common) Fail() { c.failed = true } ...@@ -162,7 +162,7 @@ func (c *common) Fail() { c.failed = true }
func (c *common) Failed() bool { return c.failed } func (c *common) Failed() bool { return c.failed }
// FailNow marks the function as having failed and stops its execution. // FailNow marks the function as having failed and stops its execution.
// Execution will continue at the next Test. // Execution will continue at the next test or benchmark.
func (c *common) FailNow() { func (c *common) FailNow() {
c.Fail() c.Fail()
...@@ -246,7 +246,7 @@ func (t *T) Parallel() { ...@@ -246,7 +246,7 @@ func (t *T) Parallel() {
} }
// An internal type but exported because it is cross-package; part of the implementation // An internal type but exported because it is cross-package; part of the implementation
// of gotest. // of the "go test" command.
type InternalTest struct { type InternalTest struct {
Name string Name string
F func(*T) F func(*T)
...@@ -275,7 +275,7 @@ func tRunner(t *T, test *InternalTest) { ...@@ -275,7 +275,7 @@ func tRunner(t *T, test *InternalTest) {
} }
// An internal function but exported because it is cross-package; part of the implementation // An internal function but exported because it is cross-package; part of the implementation
// of gotest. // of the "go test" command.
func Main(matchString func(pat, str string) (bool, error), tests []InternalTest, benchmarks []InternalBenchmark, examples []InternalExample) { func Main(matchString func(pat, str string) (bool, error), tests []InternalTest, benchmarks []InternalBenchmark, examples []InternalExample) {
flag.Parse() flag.Parse()
parseCpuList() parseCpuList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment