cmd/go, testing: remove redundant "for pkg" in coverage message

This is a transcript before this change. I've capitalized the text being removed.
Note that it is always near another line that already says fmt, marked with <<<

$ cd $GOROOT/src/pkg/fmt

$ go test -cover
PASS
coverage FOR FMT: 91.3% of statements
ok  	fmt	0.040s <<<

$ go test -coverpkg strconv
PASS
coverage FOR FMT: 64.9% of statements in strconv
ok  	fmt	0.039s <<<

$ go test -cover -c
$ ./fmt.test -test.covermode=set <<<
PASS
coverage FOR FMT: 91.3% of statements

$ go test -coverpkg strconv -c
$ ./fmt.test -test.covermode=set <<<
PASS
coverage FOR FMT: 64.9% of statements in strconv

That the summary printed by 'go test [options] fmt' is unchanged:

$ go test -cover fmt
ok  	fmt	0.040s	coverage: 91.3% of statements

$ go test -coverpkg strconv fmt
ok  	fmt	0.038s	coverage: 64.9% of statements in strconv

R=r
CC=gobot, golang-dev
https://golang.org/cl/10932045

diff --git a/src/cmd/go/test.go b/src/cmd/go/test.go
index 57b764586a71ed0f0692a1a5ef8378cb5e2cb171..50de8f292cc8dae8edb757aeb381ae3c962514a5 100644 (file)
--- a/src/cmd/go/test.go
+++ b/src/cmd/go/test.go
@@ -937,7 +937,7 @@ func coveragePercentage(out []byte) string {
        // The string looks like
        //      test coverage for encoding/binary: 79.9% of statements
        // Extract the piece from the percentage to the end of the line.
-       re := regexp.MustCompile(`coverage for [^ ]+: (.*)\n`)
+       re := regexp.MustCompile(`coverage: (.*)\n`)
        matches := re.FindSubmatch(out)
        if matches == nil {
                // Probably running "go test -cover" not "go test -cover fmt".

diff --git a/src/pkg/testing/cover.go b/src/pkg/testing/cover.go
index 4f66a0b7920248128adfffc36a1c22fae7028e84..22a5299b8f5b4160f6eb026b0e64ff17a94b7c2b 100644 (file)
--- a/src/pkg/testing/cover.go
+++ b/src/pkg/testing/cover.go
@@ -89,5 +89,5 @@ func coverReport() {
        if total == 0 {
                total = 1
        }
-       fmt.Printf("coverage for %s: %.1f%% of statements%s\n", testedPackage, 100*float64(active)/float64(total), coveredPackage)
+       fmt.Printf("coverage: %.1f%% of statements%s\n", 100*float64(active)/float64(total), coveredPackage)
 }