Merge pull request #66816 from cofyc/revert66061

Automatic merge from submit-queue (batch tested with PRs 66270, 60554, 66816). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Revert "Passing `KUBE_TEST_ARGS` variable to make through process environment" This reverts commit fda0edcd. **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #66782 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #66816 from cofyc/revert66061
167a513f · Kubernetes Submit Queue · GitHub · 2579ecd7 · dc4a8a66 · 167a513f
Unverified Commit 167a513f authored Jul 31, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

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

No files found.
--- 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"