Merge pull request #6436 from rhcarvalho/explicit-timeout

Merged by openshift-bot
openshift · Dec 23, 2015 · b197d32 · b197d32
2 parents 6bd3bad + 8fc9c9e
commit b197d32
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/hack/test-go.sh b/hack/test-go.sh
@@ -75,7 +75,7 @@ if [ -z ${KUBE_RACE+x} ]; then
   KUBE_RACE=""
 fi
 
-KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 60s}
+KUBE_TIMEOUT=${KUBE_TIMEOUT:-'60s'}
 
 if [ "${1-}" != "" ]; then
   if [[ "${1}" == *"/..." ]]; then
@@ -109,7 +109,7 @@ if [[ -n "${KUBE_COVER}" && -n "${OUTPUT_COVERAGE}" ]]; then
     mkdir -p "$OUTPUT_COVERAGE/$test_package"
     KUBE_COVER_PROFILE="-coverprofile=$OUTPUT_COVERAGE/$test_package/profile.out"
 
-    go test $KUBE_RACE $KUBE_TIMEOUT $KUBE_COVER "$KUBE_COVER_PROFILE" "$test_package" "${@:2}"
+    go test $KUBE_RACE -timeout $KUBE_TIMEOUT $KUBE_COVER "$KUBE_COVER_PROFILE" "$test_package" "${@:2}"
   done
 
   echo 'mode: atomic' > ${OUTPUT_COVERAGE}/profiles.out
@@ -118,7 +118,7 @@ if [[ -n "${KUBE_COVER}" && -n "${OUTPUT_COVERAGE}" ]]; then
 
   rm -rf $OUTPUT_COVERAGE/$OS_GO_PACKAGE
 else
-  nice go test $KUBE_RACE $KUBE_TIMEOUT $KUBE_COVER "${@:2}" $test_packages
+  nice go test $KUBE_RACE -timeout $KUBE_TIMEOUT $KUBE_COVER "${@:2}" $test_packages
 fi
 
 ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret"