Merge pull request #27482 from quinton-hoole/2016-06-15-build-darwin-test-binaries-on-os-x

Automatic merge from submit-queue Build Darwin test binaries on OS X when KUBE_FASTBUILD is set Without this, on OS X, test binaries would not be built for the local ARCH, and test scripts fail with an obscure error due to not being able to find the correct binary to run. This makes the behavior on OS X more consistent with Linux. Tested on OS X and Linux.

Merge pull request #27482 from quinton-hoole/2016-06-15-build-darwin-test-binaries-on-os-x
ba7e0b4d · k8s-merge-robot · GitHub · ce0227bb · 5c546a18 · ba7e0b4d
Commit ba7e0b4d authored Jun 24, 2016 by k8s-merge-robot Committed by GitHub Jun 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

golang.sh hack/lib/golang.sh +5 -1

No files found.
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -53,13 +53,17 @@ readonly KUBE_SERVER_BINARIES=("${KUBE_SERVER_TARGETS[@]##*/}")

 if [[ "${KUBE_FASTBUILD:-}" == "true" ]]; then
  readonly KUBE_SERVER_PLATFORMS=(linux/amd64)
-  readonly KUBE_TEST_PLATFORMS=(linux/amd64)
  if [[ "${KUBE_BUILDER_OS:-}" == "darwin"* ]]; then
+    readonly KUBE_TEST_PLATFORMS=(
+      darwin/amd64
+      linux/amd64
+    )
    readonly KUBE_CLIENT_PLATFORMS=(
      darwin/amd64
      linux/amd64
    )
  else
+    readonly KUBE_TEST_PLATFORMS=(linux/amd64)
    readonly KUBE_CLIENT_PLATFORMS=(linux/amd64)
  fi
 else