Merge pull request kubernetes#75751 from BenTheElder/bash-fun

k8s-ci-robot · web-flow · commit f6c51d6e9923 · 2019-03-26T23:19:01.000-07:00
fix kube::golang::is_instrumented_package
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
@@ -496,7 +496,8 @@ kube::golang::outfile_for_binary() {
 # Returns 0 if the binary can be built with coverage, 1 otherwise.
 # NB: this ignores whether coverage is globally enabled or not.
 kube::golang::is_instrumented_package() {
-  return "$(kube::util::array_contains "$1" "${KUBE_COVERAGE_INSTRUMENTED_PACKAGES[@]}")"
+  kube::util::array_contains "$1" "${KUBE_COVERAGE_INSTRUMENTED_PACKAGES[@]}"
+  return $?
 }
 
 # Argument: the name of a Kubernetes package (e.g. k8s.io/kubernetes/cmd/kube-scheduler)

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,8 @@ kube::golang::outfile_for_binary() {`
`496`	`496`	`# Returns 0 if the binary can be built with coverage, 1 otherwise.`
`497`	`497`	`# NB: this ignores whether coverage is globally enabled or not.`
`498`	`498`	`kube::golang::is_instrumented_package() {`
`499`		`- return "$(kube::util::array_contains "$1" "${KUBE_COVERAGE_INSTRUMENTED_PACKAGES[@]}")"`
	`499`	`+ kube::util::array_contains "$1" "${KUBE_COVERAGE_INSTRUMENTED_PACKAGES[@]}"`
	`500`	`+ return $?`
`500`	`501`	`}`
`501`	`502`
`502`	`503`	`# Argument: the name of a Kubernetes package (e.g. k8s.io/kubernetes/cmd/kube-scheduler)`