Skip to content

Commit

Permalink
lcov_merger: workaround for Bazel 0.18.0 coverage
Browse files Browse the repository at this point in the history
When collecting coverage, Bazel now expects test rules to have an
implicit "$lcov_merger" or "_lcov_merger" attribute that points to a
binary to be run by the test driver script.

This change adds a dummy _lcov_merger attribute to go_test. The script
does nothing for now.

Related bazelbuild/bazel#6293
  • Loading branch information
Jay Conrod committed Oct 15, 2018
1 parent 6f55a50 commit 28037bd
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 0 deletions.
6 changes: 6 additions & 0 deletions go/private/rules/test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ go_test = go_rule(
"rundir": attr.string(),
"x_defs": attr.string_dict(),
"linkmode": attr.string(default = LINKMODE_NORMAL),
# Workaround for bazelbuild/bazel#6293. See comment in lcov_merger.sh.
"_lcov_merger": attr.label(
executable = True,
default = "@io_bazel_rules_go//go/tools/builders:lcov_merger",
cfg = "target",
),
},
executable = True,
test = True,
Expand Down
6 changes: 6 additions & 0 deletions go/tools/builders/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@ go_tool_binary(
visibility = ["//visibility:public"],
)

sh_binary(
name = "lcov_merger",
srcs = ["lcov_merger.sh"],
visibility = ["//visibility:public"],
)

filegroup(
name = "all_builder_srcs",
testonly = True,
Expand Down
21 changes: 21 additions & 0 deletions go/tools/builders/lcov_merger.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash

# Copyright 2018 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.

# This is a workaround for bazelbuild/bazel#6293. Since Bazel 0.18.0, Bazel
# expects tests to have an "$lcov_merger' or "_lcov_merger" attribute that
# points to an executable. If this is missing, the test driver fails.

exit 0

0 comments on commit 28037bd

Please sign in to comment.