Skip to content

Commit

Permalink
cmd/go: rename renamed testing import
Browse files Browse the repository at this point in the history
_go_testing is equally unlikely and much less concerning
than testing_xxxxxxxxxxxx if it appears in an error message
(as it does, for example, in https://storage.googleapis.com/go-build-log/0d543f89/linux-amd64_3467a10e.log).

Change-Id: I45dc3ebe2d3b6c9e53273cd21782ee11a53f5edb
Reviewed-on: https://go-review.googlesource.com/c/go/+/177197
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
  • Loading branch information
rsc committed May 16, 2019
1 parent 54260c5 commit 0c47e24
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/cmd/go/internal/load/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,7 @@ func checkTestFunc(fn *ast.FuncDecl, arg string) error {
var testinginitTmpl = lazytemplate.New("init", `
package {{.Name}}
{{/* Avoid a name collision with a name "testing" in user code. */}}
import testing_xxxxxxxxxxxx "testing"
import _go_testing "testing"
{{/*
Call testing.Init before any other user initialization code runs.
Expand All @@ -636,7 +635,7 @@ This provides the illusion of the old behavior where testing flags
were registered as part of the testing package's initialization.
*/}}
var _ = func() bool {
testing_xxxxxxxxxxxx.Init()
_go_testing.Init()
return true
}()
`)
Expand Down

0 comments on commit 0c47e24

Please sign in to comment.