mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-05 02:09:56 +00:00
Allow -race to be disabled in test-go.sh
This commit is contained in:
parent
06316f4861
commit
54e0af8b96
@ -47,6 +47,7 @@ find_test_pkgs() {
|
|||||||
# -covermode=atomic becomes default with -race in Go >=1.3
|
# -covermode=atomic becomes default with -race in Go >=1.3
|
||||||
KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
|
KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
|
||||||
KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 60s}
|
KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 60s}
|
||||||
|
KUBE_RACE=${KUBE_RACE:--race}
|
||||||
|
|
||||||
cd "${KUBE_TARGET}"
|
cd "${KUBE_TARGET}"
|
||||||
|
|
||||||
@ -121,7 +122,7 @@ if [[ "${iterations}" -gt 1 ]]; then
|
|||||||
count=0
|
count=0
|
||||||
for i in $(seq 1 ${iterations}); do
|
for i in $(seq 1 ${iterations}); do
|
||||||
if go test "${goflags[@]:+${goflags[@]}}" \
|
if go test "${goflags[@]:+${goflags[@]}}" \
|
||||||
-race ${KUBE_TIMEOUT} "${pkg}"; then
|
${KUBE_RACE} ${KUBE_TIMEOUT} "${pkg}"; then
|
||||||
pass=$((pass + 1))
|
pass=$((pass + 1))
|
||||||
else
|
else
|
||||||
fails=$((fails + 1))
|
fails=$((fails + 1))
|
||||||
@ -145,7 +146,7 @@ if [[ -n "$1" ]]; then
|
|||||||
mkdir -p "${covdir}/${arg}"
|
mkdir -p "${covdir}/${arg}"
|
||||||
pkg=${KUBE_GO_PACKAGE}/${arg}
|
pkg=${KUBE_GO_PACKAGE}/${arg}
|
||||||
go test "${goflags[@]:+${goflags[@]}}" \
|
go test "${goflags[@]:+${goflags[@]}}" \
|
||||||
-race \
|
${KUBE_RACE} \
|
||||||
${KUBE_TIMEOUT} \
|
${KUBE_TIMEOUT} \
|
||||||
${KUBE_COVER} -coverprofile="${covdir}/${arg}/coverage.out" \
|
${KUBE_COVER} -coverprofile="${covdir}/${arg}/coverage.out" \
|
||||||
"${pkg}"
|
"${pkg}"
|
||||||
@ -154,6 +155,6 @@ if [[ -n "$1" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
find_test_pkgs | xargs go test "${goflags[@]:+${goflags[@]}}" \
|
find_test_pkgs | xargs go test "${goflags[@]:+${goflags[@]}}" \
|
||||||
-race \
|
${KUBE_RACE} \
|
||||||
${KUBE_TIMEOUT} \
|
${KUBE_TIMEOUT} \
|
||||||
${KUBE_COVER}
|
${KUBE_COVER}
|
||||||
|
Loading…
Reference in New Issue
Block a user