diff options
| author | Zeke Lu <lvzecai@gmail.com> | 2022-08-25 04:17:00 +0000 |
|---|---|---|
| committer | Heschi Kreinick <heschi@google.com> | 2022-08-29 19:17:24 +0000 |
| commit | 175c2da72511f66334b142e36342a71e54d93d97 (patch) | |
| tree | a6913892bc04ddd2877924360baf9ec72b10e242 | |
| parent | 7a575a5784e9fc61e53d03b2bdcf04d64f75cb06 (diff) | |
| download | go-175c2da72511f66334b142e36342a71e54d93d97.tar.gz go-175c2da72511f66334b142e36342a71e54d93d97.zip | |
[release-branch.go1.18] cmd/go/internal/imports: include ToolTags in the Tags map
This fixes a regression introduced when the "race" mode tag was moved to
the ToolTags field in CL 358539.
Fixes #54659
Updates #54468
Change-Id: I107771948a4fe9d743cc13d1c15f324212b08e03
GitHub-Last-Rev: d211e351ef3331f2c38b16d327d992a32ebbfe30
GitHub-Pull-Request: golang/go#54618
Reviewed-on: https://go-review.googlesource.com/c/go/+/425154
Reviewed-by: David Chase <drchase@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
(cherry picked from commit 6ba2674ddc5373f261211ba5ebc38496dc660604)
Reviewed-on: https://go-review.googlesource.com/c/go/+/426435
Reviewed-by: Heschi Kreinick <heschi@google.com>
| -rw-r--r-- | src/cmd/go/internal/imports/tags.go | 3 | ||||
| -rw-r--r-- | src/cmd/go/testdata/script/test_race_tag.txt | 29 |
2 files changed, 32 insertions, 0 deletions
diff --git a/src/cmd/go/internal/imports/tags.go b/src/cmd/go/internal/imports/tags.go index 01b448b914..d1467b81b0 100644 --- a/src/cmd/go/internal/imports/tags.go +++ b/src/cmd/go/internal/imports/tags.go @@ -36,6 +36,9 @@ func loadTags() map[string]bool { for _, tag := range cfg.BuildContext.BuildTags { tags[tag] = true } + for _, tag := range cfg.BuildContext.ToolTags { + tags[tag] = true + } for _, tag := range cfg.BuildContext.ReleaseTags { tags[tag] = true } diff --git a/src/cmd/go/testdata/script/test_race_tag.txt b/src/cmd/go/testdata/script/test_race_tag.txt new file mode 100644 index 0000000000..4b18ebc454 --- /dev/null +++ b/src/cmd/go/testdata/script/test_race_tag.txt @@ -0,0 +1,29 @@ +# Tests Issue #54468 + +[short] skip 'links a test binary' +[!race] skip + +go mod tidy +go test -c -o=$devnull -race . + +! stderr 'cannot find package' + +-- go.mod -- +module testrace + +go 1.18 + +require rsc.io/sampler v1.0.0 +-- race_test.go -- +//go:build race + +package testrace + +import ( + "testing" + + _ "rsc.io/sampler" +) + +func TestRaceTag(t *testing.T) { +} |