Merge pull request #28965 from smarterclayton/fix_mac_build

Automatic merge from submit-queue

Makefile should use `paste ... -` for posix semantics

@thockin fixes #28930
This commit is contained in:
k8s-merge-robot 2016-07-19 00:00:37 -07:00 committed by GitHub
commit c3e72aeff5

View File

@ -60,7 +60,7 @@ runTests() {
# TODO: Re-enable race detection when we switch to a thread-safe etcd client
# KUBE_RACE="-race"
make -C "${KUBE_ROOT}" test \
WHAT="$(kube::test::find_integration_test_dirs | paste -sd' ')" \
WHAT="$(kube::test::find_integration_test_dirs | paste -sd' ' -)" \
KUBE_GOFLAGS="${KUBE_GOFLAGS:-} -tags 'integration no-docker'" \
KUBE_RACE="" \
KUBE_TIMEOUT="${KUBE_TIMEOUT}" \