github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use KUBE_BUILD_WITH_COVERAGE directly.

pull/58/head
Katharine Berry 2018-09-07 08:48:16 -07:00
parent 361746266a
commit 449e94b295
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/lib/golang.sh
View File

@ -523,14 +523,14 @@ kube::golang::delete_coverage_dummy_test() {
# Arguments: a list of kubernetes packages to build. # Arguments: a list of kubernetes packages to build.
# Expected variables: ${build_args} should be set to an array of Go build arguments. # Expected variables: ${build_args} should be set to an array of Go build arguments.
# In addition, ${package} and ${platform} should have been set earlier, and if # In addition, ${package} and ${platform} should have been set earlier, and if
# ${build_with_coverage} is set, coverage instrumentation will be enabled. # ${KUBE_BUILD_WITH_COVERAGE} is set, coverage instrumentation will be enabled.
# #
# Invokes Go to actually build some packages. If coverage is disabled, simply invokes # Invokes Go to actually build some packages. If coverage is disabled, simply invokes
# go install. If coverage is enabled, builds covered binaries using go test, temporarily # go install. If coverage is enabled, builds covered binaries using go test, temporarily
# producing the required unit test files and then cleaning up after itself. # producing the required unit test files and then cleaning up after itself.
# Non-covered binaries are then built using go install as usual. # Non-covered binaries are then built using go install as usual.
kube::golang::build_some_binaries() { kube::golang::build_some_binaries() {
if [[ -n "${build_with_coverage:-}" ]]; then if [[ -n "${KUBE_BUILD_WITH_COVERAGE:-}" ]]; then
local -a uncovered=() local -a uncovered=()
for package in "$@"; do for package in "$@"; do
if kube::golang::is_instrumented_package "${package}"; then if kube::golang::is_instrumented_package "${package}"; then
@ -661,11 +661,10 @@ kube::golang::build_binaries() {
host_platform=$(kube::golang::host_platform) host_platform=$(kube::golang::host_platform)
# Use eval to preserve embedded quoted strings. # Use eval to preserve embedded quoted strings.
local goflags goldflags gogcflags build_with_coverage local goflags goldflags gogcflags
eval "goflags=(${GOFLAGS:-})" eval "goflags=(${GOFLAGS:-})"
goldflags="${GOLDFLAGS:-} $(kube::version::ldflags)" goldflags="${GOLDFLAGS:-} $(kube::version::ldflags)"
gogcflags="${GOGCFLAGS:-}" gogcflags="${GOGCFLAGS:-}"
build_with_coverage="${KUBE_BUILD_WITH_COVERAGE:-}"
local -a targets=() local -a targets=()
local arg local arg