From eb6929299b6da3d9bea1fa7f7cd319c2de9242bb Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 1 Nov 2011 22:05:34 -0400 Subject: src/pkg/[n-z]*: gofix -r error -force=error R=golang-dev, bsiegert, iant CC=golang-dev https://golang.org/cl/5294074 --- src/pkg/testing/testing.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/pkg/testing/testing.go') diff --git a/src/pkg/testing/testing.go b/src/pkg/testing/testing.go index a555cb4a15..5869642c7e 100644 --- a/src/pkg/testing/testing.go +++ b/src/pkg/testing/testing.go @@ -173,7 +173,7 @@ func tRunner(t *T, test *InternalTest) { // An internal function but exported because it is cross-package; part of the implementation // of gotest. -func Main(matchString func(pat, str string) (bool, os.Error), tests []InternalTest, benchmarks []InternalBenchmark, examples []InternalExample) { +func Main(matchString func(pat, str string) (bool, error), tests []InternalTest, benchmarks []InternalBenchmark, examples []InternalExample) { flag.Parse() parseCpuList() @@ -201,7 +201,7 @@ func report(t *T) { } } -func RunTests(matchString func(pat, str string) (bool, os.Error), tests []InternalTest) (ok bool) { +func RunTests(matchString func(pat, str string) (bool, error), tests []InternalTest) (ok bool) { ok = true if len(tests) == 0 { fmt.Fprintln(os.Stderr, "testing: warning: no tests to run") @@ -217,7 +217,7 @@ func RunTests(matchString func(pat, str string) (bool, os.Error), tests []Intern for i := 0; i < len(tests); i++ { matched, err := matchString(*match, tests[i].Name) if err != nil { - println("invalid regexp for -test.run:", err.String()) + println("invalid regexp for -test.run:", err.Error()) os.Exit(1) } if !matched { -- cgit v1.3-5-g9baa