From 58cdadd86ad26013156cebd1846202b8e63bec92 Mon Sep 17 00:00:00 2001
From: Dan McPherson <dmcphers@redhat.com>
Date: Thu, 12 Feb 2015 14:44:19 -0500
Subject: [PATCH] Making race an option for sh scripts

---
 Makefile                        | 4 ++--
 hack/test-integration-docker.sh | 2 +-
 hack/test-integration.sh        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 49b79267a26a..0a682d6752d0 100644
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ test: build check
 endif
 test:
 	hack/test-cmd.sh
-	hack/test-integration.sh $(GOFLAGS)
-	hack/test-integration-docker.sh $(GOFLAGS)
+	KUBE_RACE=" " hack/test-integration.sh $(GOFLAGS)
+	KUBE_RACE=" " hack/test-integration-docker.sh $(GOFLAGS)
 	hack/test-end-to-end.sh
 .PHONY: test
 
diff --git a/hack/test-integration-docker.sh b/hack/test-integration-docker.sh
index d638bb2506c2..a65de7c85e4d 100755
--- a/hack/test-integration-docker.sh
+++ b/hack/test-integration-docker.sh
@@ -22,4 +22,4 @@ trap cleanup EXIT SIGINT
 echo
 echo Docker integration test cases ...
 echo
-KUBE_RACE=" " KUBE_COVER=" " "${OS_ROOT}/hack/test-go.sh" test/integration -tags 'integration docker' "${@:1}"
+KUBE_RACE="${KUBE_RACE:-}" KUBE_COVER=" " "${OS_ROOT}/hack/test-go.sh" test/integration -tags 'integration docker' "${@:1}"
diff --git a/hack/test-integration.sh b/hack/test-integration.sh
index 5418728e65c6..9d5d12451b9e 100755
--- a/hack/test-integration.sh
+++ b/hack/test-integration.sh
@@ -23,4 +23,4 @@ echo
 echo Integration test cases ...
 echo
 # TODO: race is disabled because of origin #731
-KUBE_RACE=" " KUBE_COVER=" " "${OS_ROOT}/hack/test-go.sh" test/integration -tags 'integration no-docker' "${@:1}"
+KUBE_RACE="${KUBE_RACE:-}" KUBE_COVER=" " "${OS_ROOT}/hack/test-go.sh" test/integration -tags 'integration no-docker' "${@:1}"