From d397d64b9e650746ebbccb4d1e4c709ec5362db8 Mon Sep 17 00:00:00 2001
From: Daniel Smith <dbsmith@google.com>
Date: Tue, 9 Sep 2014 14:04:39 -0700
Subject: [PATCH] go test -cover -race is fixed now

---
 hack/test-go.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/hack/test-go.sh b/hack/test-go.sh
index 5154916f184..ff247c09d47 100755
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -44,14 +44,8 @@ find_test_pkgs() {
   find_test_dirs | xargs -n1 printf "${KUBE_GO_PACKAGE}/%s\n"
 }
 
-# there is currently a race in the coverage code in tip.  Remove this when it is fixed
-# see https://code.google.com/p/go/issues/detail?id=8630 for details.
-if [ "${TRAVIS_GO_VERSION}" == "tip" ]; then
-  KUBE_COVER=""
-else
-  # -covermode=atomic becomes default with -race in Go >=1.3
-  KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
-fi
+# -covermode=atomic becomes default with -race in Go >=1.3
+KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
 KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s}
 
 cd "${KUBE_TARGET}"