Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include go_transition_test in bazel aspect #3160

Merged
merged 1 commit into from
Jun 23, 2022
Merged

Include go_transition_test in bazel aspect #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go/tools/gopackagesdriver/aspect.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def _go_pkg_info_aspect_impl(target, ctx):
pkg = _go_archive_to_pkg(archive)
pkg_json_files.append(_make_pkg_json(ctx, archive, pkg))

if ctx.rule.kind == "go_test":
if ctx.rule.kind in ["go_test", "go_transition_test"]:
for dep_archive in archive.direct:
# find the archive containing the test sources
if archive.data.label == dep_archive.data.label:
Expand Down
12 changes: 5 additions & 7 deletions go/tools/gopackagesdriver/bazel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,13 @@ func (b *Bazel) Query(ctx context.Context, args ...string) ([]string, error) {
if err != nil {
return nil, fmt.Errorf("bazel query failed: %w", err)
}
return strings.Split(strings.TrimSpace(output), "\n"), nil
}

func (b *Bazel) QueryLabels(ctx context.Context, args ...string) ([]string, error) {
output, err := b.run(ctx, "query", args...)
if err != nil {
return nil, fmt.Errorf("bazel query failed: %w", err)
trimmedOutput := strings.TrimSpace(output)
if len(trimmedOutput) == 0 {
return nil, nil
}
return strings.Split(strings.TrimSpace(output), "\n"), nil

return strings.Split(trimmedOutput, "\n"), nil
}

func (b *Bazel) WorkspaceRoot() string {
Expand Down
2 changes: 1 addition & 1 deletion go/tools/gopackagesdriver/bazel_json_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (b *BazelJSONBuilder) fileQuery(filename string) string {
fp, _ := filepath.Rel(b.bazel.WorkspaceRoot(), filename)
filename = fp
}
return fmt.Sprintf(`kind("go_library|go_test", same_pkg_direct_rdeps("%s"))`, filename)
return fmt.Sprintf(`kind("go_library|go_test|go_transition_test", same_pkg_direct_rdeps("%s"))`, filename)
}

func (b *BazelJSONBuilder) packageQuery(importPath string) string {
Expand Down