-
-
Notifications
You must be signed in to change notification settings - Fork 668
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nogo: Create a go_register_nogo wrapper for WORKSPACE users.
Currently, workspace users register nogo targets by abusing the go_register_toolchain() function, which calls go_register_nogo(). Instead, we should expose go_register_nogo to workspace users directly. This will allow workspace users and bzlmod users to use the same underlying code because go_register_nogo allows users to specify includes and excludes which you currently can't do with WORKSPACE. Add a test to verify this functionality works in WORKSPACE too.
- Loading branch information
1 parent
30099a6
commit 9b55534
Showing
10 changed files
with
208 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| load("@io_bazel_rules_go//go/tools/bazel_testing:def.bzl", "go_bazel_test") | ||
|
|
||
| go_bazel_test( | ||
| name = "includes_exclude_test", | ||
| srcs = ["includes_excludes_test.go"], | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| Nogo excludes-includes configuration | ||
| ================== | ||
|
|
||
| .. _nogo: /go/nogo.rst | ||
|
|
||
| Tests that verify nogo_ `includes` and `excludes` works when configured from ``WORKSPACE.bazel``. | ||
|
|
||
| .. contents:: | ||
|
|
||
| includes_excludes_test | ||
| ----------- | ||
|
|
||
| Verifies that `go_library`_ targets can be built in default configurations with | ||
| nogo with includes and excludes being honored. |
120 changes: 120 additions & 0 deletions
120
tests/core/nogo/includes_excludes/includes_excludes_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| // Copyright 2019 The Bazel Authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package includes_excludes_test | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/bazelbuild/rules_go/go/tools/bazel_testing" | ||
| ) | ||
|
|
||
| func TestMain(m *testing.M) { | ||
| bazel_testing.TestMain(m, bazel_testing.Args{ | ||
| Nogo: "@//:my_nogo", | ||
| NogoIncludes: []string{"@//go:__subpackages__"}, | ||
| NogoExcludes: []string{"@//go/third_party:__subpackages__"}, | ||
| Main: ` | ||
| -- BUILD.bazel -- | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_library", "nogo", "TOOLS_NOGO") | ||
| nogo( | ||
| name = "my_nogo", | ||
| visibility = ["//visibility:public"], | ||
| deps = TOOLS_NOGO, | ||
| ) | ||
| go_library( | ||
| name = "lib", | ||
| srcs = ["lib.go"], | ||
| importpath = "example.com/lib", | ||
| ) | ||
| -- lib.go -- | ||
| package lib | ||
| func shadowed() string { | ||
| foo := "original" | ||
| if foo == "original" { | ||
| foo := "shadow" | ||
| return foo | ||
| } | ||
| return foo | ||
| } | ||
| -- go/BUILD.bazel -- | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_library") | ||
| go_library( | ||
| name = "lib", | ||
| srcs = ["lib.go"], | ||
| importpath = "example.com/go/lib", | ||
| ) | ||
| -- go/lib.go -- | ||
| package lib | ||
| func shadowed() string { | ||
| foo := "original" | ||
| if foo == "original" { | ||
| foo := "shadow" | ||
| return foo | ||
| } | ||
| return foo | ||
| } | ||
| -- go/third_party/BUILD.bazel -- | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_library") | ||
| go_library( | ||
| name = "lib", | ||
| srcs = ["lib.go"], | ||
| importpath = "example.com/go/third_party/lib", | ||
| ) | ||
| -- go/third_party/lib.go -- | ||
| package lib | ||
| func shadowed() string { | ||
| foo := "original" | ||
| if foo == "original" { | ||
| foo := "shadow" | ||
| return foo | ||
| } | ||
| return foo | ||
| } | ||
| `, | ||
| }) | ||
| } | ||
|
|
||
| func TestNotIncluded(t *testing.T) { | ||
| if err := bazel_testing.RunBazel("build", "//:lib"); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } | ||
|
|
||
| func TestIncluded(t *testing.T) { | ||
| if err := bazel_testing.RunBazel("build", "//go:lib"); err == nil { | ||
| t.Fatal("Expected build to fail") | ||
| } else if !strings.Contains(err.Error(), "lib.go:6:3: declaration of \"foo\" shadows declaration at line 4 (shadow)") { | ||
| t.Fatalf("Expected error to contain \"lib.go:6:3: declaration of \"foo\" shadows declaration at line 4 (shadow)\", got %s", err) | ||
| } | ||
| } | ||
|
|
||
| func TestExcluded(t *testing.T) { | ||
| if err := bazel_testing.RunBazel("build", "//go/third_party:lib"); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters