Passing `KUBE_TEST_ARGS` variable to make through process environment

instead of command line flags. '$' character has special meaning in make, prefer passing variables through process environment.

Passing `KUBE_TEST_ARGS` variable to make through process environment
fda0edcd · Yecheng Fu · bababe08 · fda0edcd
Commit fda0edcd authored Jul 11, 2018 by Yecheng Fu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

test-integration.sh hack/make-rules/test-integration.sh +4 -2

No files found.
--- a/hack/make-rules/test-integration.sh
+++ b/hack/make-rules/test-integration.sh
@@ -68,10 +68,12 @@ runTests() {
  kube::log::status "Running integration test cases"

  KUBE_RACE="-race"
-  make -C "${KUBE_ROOT}" test \
+  # KUBE_TEST_ARGS may contain '$' character which has special meaning in make,
+  # 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' ' -)}" \
      GOFLAGS="${GOFLAGS:-}" \
-      KUBE_TEST_ARGS="${KUBE_TEST_ARGS:-} ${SHORT:--short=true} --vmodule=${KUBE_TEST_VMODULE} --alsologtostderr=true" \
      KUBE_RACE="" \
      KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
      KUBE_TEST_API_VERSIONS="$1"