Skip to content

K
k3s
Commit c3e72aef authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28965 from smarterclayton/fix_mac_build

Automatic merge from submit-queue Makefile should use `paste ... -` for posix semantics @thockin fixes #28930
parents b3797b8a a05dcaac
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
hack/make-rules/test-integration.sh
View file @ c3e72aef
...@@ -60,7 +60,7 @@ runTests() { ...@@ -60,7 +60,7 @@ runTests() {
# TODO: Re-enable race detection when we switch to a thread-safe etcd client # TODO: Re-enable race detection when we switch to a thread-safe etcd client
# KUBE_RACE="-race" # KUBE_RACE="-race"
make -C "${KUBE_ROOT}" test \ 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_GOFLAGS="${KUBE_GOFLAGS:-} -tags 'integration no-docker'" \
KUBE_RACE="" \ KUBE_RACE="" \
KUBE_TIMEOUT="${KUBE_TIMEOUT}" \ KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment