@@ -59,7 +59,7 @@ $(info build is being skipped)

 test: check

 else

 test: build check

-endif 

+endif

 test:

 	hack/test-cmd.sh

 	hack/test-integration.sh $(GOFLAGS)

@@ -31,22 +31,32 @@ find_test_dirs() {

 # -covermode=atomic becomes default with -race in Go >=1.3

 if [ -z ${KUBE_COVER+x} ]; then

-  KUBE_COVER="" #"-cover -covermode=atomic"

+  KUBE_COVER=""

+fi

+

+OUTPUT_COVERAGE=${OUTPUT_COVERAGE:-""}

+

+if [ -n "${OUTPUT_COVERAGE}" ]; then

+  if [ -z "${KUBE_RACE}" ]; then

+    KUBE_RACE="-race"

+  fi

+  if [ -z "${KUBE_COVER}" ]; then

+    KUBE_COVER="-cover -covermode=atomic"

+  fi

 fi

-KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 45s}

 if [ -z ${KUBE_RACE+x} ]; then

-  KUBE_RACE="" #"-race"

+  KUBE_RACE=""

 fi

+KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 45s}

+

 if [ "${1-}" != "" ]; then

   test_packages="$OS_GO_PACKAGE/$1"

 else

   test_packages=`find_test_dirs`

 fi

-OUTPUT_COVERAGE=${OUTPUT_COVERAGE:-""}

-

 export OPENSHIFT_ON_PANIC=crash

 if [[ -n "${KUBE_COVER}" && -n "${OUTPUT_COVERAGE}" ]]; then

@@ -22,4 +22,4 @@ trap cleanup EXIT SIGINT

 echo

 echo Docker integration test cases ...

 echo

-KUBE_RACE="${KUBE_RACE:--race}" KUBE_COVER=" " "${OS_ROOT}/hack/test-go.sh" test/integration -tags 'integration docker' "${@:1}"

+KUBE_RACE=" " KUBE_COVER=" " "${OS_ROOT}/hack/test-go.sh" test/integration -tags 'integration docker' "${@:1}"

@@ -23,4 +23,4 @@ echo

 echo Integration test cases ...

 echo

 # TODO: race is disabled because of origin #731

-KUBE_RACE="${KUBE_RACE:-}" KUBE_COVER=" " "${OS_ROOT}/hack/test-go.sh" test/integration -tags 'integration no-docker' "${@:1}"

+KUBE_RACE=" " KUBE_COVER=" " "${OS_ROOT}/hack/test-go.sh" test/integration -tags 'integration no-docker' "${@:1}"