From dc4a8a669680a0965fad1c67ac29753836adba83 Mon Sep 17 00:00:00 2001
From: Yecheng Fu <fuyecheng@qiniu.com>
Date: Tue, 31 Jul 2018 16:52:37 +0800
Subject: [PATCH] Revert "Passing `KUBE_TEST_ARGS` variable to make through
 process environment"

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

diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh
index 1206b7d0d89..b69124df07c 100755
--- a/hack/make-rules/test-integration.sh
+++ b/hack/make-rules/test-integration.sh
@@ -68,12 +68,10 @@ runTests() {
   kube::log::status "Running integration test cases"
 
   KUBE_RACE="-race"
-  # 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 \
+  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"