github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Passing KUBE_TEST_ARGS variable to make through process environment"

Browse Source 
This reverts commit fda0edcd1c.
This commit is contained in:
Yecheng Fu 2018-07-31 16:52:37 +08:00
parent 10688257e6
commit dc4a8a6696
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/make-rules/test-integration.sh
View File

@ -68,12 +68,10 @@ runTests() {
kube::log::status "Running integration test cases" kube::log::status "Running integration test cases"
KUBE_RACE="-race" KUBE_RACE="-race"
# KUBE_TEST_ARGS may contain '$' character which has special meaning in make, make -C "${KUBE_ROOT}" test \
# pass it through process environment instead.
KUBE_TEST_ARGS="${KUBE_TEST_ARGS:-} ${SHORT:--short=true} --vmodule=${KUBE_TEST_VMODULE} --alsologtostderr=true" \
make -C "${KUBE_ROOT}" test \
WHAT="${WHAT:-$(kube::test::find_integration_test_dirs | paste -sd' ' -)}" \ WHAT="${WHAT:-$(kube::test::find_integration_test_dirs | paste -sd' ' -)}" \
GOFLAGS="${GOFLAGS:-}" \ GOFLAGS="${GOFLAGS:-}" \
KUBE_TEST_ARGS="${KUBE_TEST_ARGS:-} ${SHORT:--short=true} --vmodule=${KUBE_TEST_VMODULE} --alsologtostderr=true" \
KUBE_RACE="" \ KUBE_RACE="" \
KUBE_TIMEOUT="${KUBE_TIMEOUT}" \ KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
KUBE_TEST_API_VERSIONS="$1" KUBE_TEST_API_VERSIONS="$1"