From 9973a66665992c49593595ae1eb70848907ea6a9 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 12 Aug 2020 16:01:49 +0000 Subject: [PATCH] build/golang.sh: convert remaining 'go' calls to use Signed-off-by: Bruce Ashfield --- hack/lib/golang.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/import/hack/lib/golang.sh b/src/import/hack/lib/golang.sh index e9148ec08fa..71d3c987563 100755 --- a/src/import/hack/lib/golang.sh +++ b/src/import/hack/lib/golang.sh @@ -651,7 +651,7 @@ kube::golang::build_some_binaries() { kube::golang::create_coverage_dummy_test "${package}" kube::util::trap_add "kube::golang::delete_coverage_dummy_test \"${package}\"" EXIT - go test -c -o "$(kube::golang::outfile_for_binary "${package}" "${platform}")" \ + $GO test -c -o "$(kube::golang::outfile_for_binary "${package}" "${platform}")" \ -covermode count \ -coverpkg k8s.io/...,k8s.io/kubernetes/vendor/k8s.io/... \ "${build_args[@]}" \ @@ -663,13 +663,13 @@ kube::golang::build_some_binaries() { done if [[ "${#uncovered[@]}" != 0 ]]; then V=2 kube::log::info "Building ${uncovered[*]} without coverage..." - go install "${build_args[@]}" "${uncovered[@]}" + $GO install "${build_args[@]}" "${uncovered[@]}" else V=2 kube::log::info "Nothing to build without coverage." fi else V=2 kube::log::info "Coverage is disabled." - go install "${build_args[@]}" "$@" + $GO install "${build_args[@]}" "$@" fi } @@ -725,7 +725,7 @@ kube::golang::build_binaries_for_platform() { testpkg=$(dirname "${test}") mkdir -p "$(dirname "${outfile}")" - go test -c \ + $GO test -c \ ${goflags:+"${goflags[@]}"} \ -gcflags "${gogcflags:-}" \ -asmflags "${goasmflags:-}" \ -- 2.19.1