From 53e3bff4641cce88f58a901759381d4229c634b3 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Thu, 4 Sep 2014 09:54:50 -0700
Subject: [PATCH] Re-enable travis for Go tip

---
 .travis.yml     | 1 +
 hack/test-go.sh | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f19e60aecc2fb..b34148365f3bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: go
 
 go:
+  - tip
   - 1.3
   - 1.2
 
diff --git a/hack/test-go.sh b/hack/test-go.sh
index 463627fa5cd5a..3e908c3ed53a8 100755
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -40,6 +40,11 @@ find_test_dirs() {
     \) -name '*_test.go' -print0 | xargs -0n1 dirname | sort -u | 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} eq "tip" ]]; then
+  KUBE_COVER=""
+fi
 # -covermode=atomic becomes default with -race in Go >=1.3
 KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
 KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s}