From fda0edcd1c853f08ce3c3d8662d38cd8ed84512d Mon Sep 17 00:00:00 2001
From: Yecheng Fu <fuyecheng@qiniu.com>
Date: Wed, 11 Jul 2018 16:52:08 +0800
Subject: [PATCH] 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.

---
 hack/make-rules/test-integration.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh
index b69124df07..1206b7d0d8 100755
--- 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"