From 54e0af8b9685a5d157420b7d62af5187b59b6c13 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Thu, 18 Sep 2014 21:27:18 -0400
Subject: [PATCH] Allow -race to be disabled in test-go.sh

---
 hack/test-go.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hack/test-go.sh b/hack/test-go.sh
index 015d1098f6d..aaca6b61d13 100755
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -47,6 +47,7 @@ find_test_pkgs() {
 # -covermode=atomic becomes default with -race in Go >=1.3
 KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
 KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 60s}
+KUBE_RACE=${KUBE_RACE:--race}
 
 cd "${KUBE_TARGET}"
 
@@ -121,7 +122,7 @@ if [[ "${iterations}" -gt 1 ]]; then
     count=0
     for i in $(seq 1 ${iterations}); do
       if go test "${goflags[@]:+${goflags[@]}}" \
-          -race ${KUBE_TIMEOUT} "${pkg}"; then
+          ${KUBE_RACE} ${KUBE_TIMEOUT} "${pkg}"; then
         pass=$((pass + 1))
       else
         fails=$((fails + 1))
@@ -145,7 +146,7 @@ if [[ -n "$1" ]]; then
     mkdir -p "${covdir}/${arg}"
     pkg=${KUBE_GO_PACKAGE}/${arg}
     go test "${goflags[@]:+${goflags[@]}}" \
-        -race \
+        ${KUBE_RACE} \
         ${KUBE_TIMEOUT} \
         ${KUBE_COVER} -coverprofile="${covdir}/${arg}/coverage.out" \
         "${pkg}"
@@ -154,6 +155,6 @@ if [[ -n "$1" ]]; then
 fi
 
 find_test_pkgs | xargs go test "${goflags[@]:+${goflags[@]}}" \
-    -race \
+    ${KUBE_RACE} \
     ${KUBE_TIMEOUT} \
     ${KUBE_COVER}