Fix makefile variable expansion for test-integration target

This commit is contained in:
Christoph Blecker
2024-02-26 09:01:04 -08:00
parent 85d903e27e
commit ca41a9222d
2 changed files with 12 additions and 5 deletions

View File

@@ -75,12 +75,16 @@ runTests() {
kube::etcd::start_scraping
kube::log::status "Running integration test cases"
make -C "${KUBE_ROOT}" test \
# shellcheck disable=SC2034
# KUBE_RACE and MAKEFLAGS are used in the downstream make, and we set them to
# empty here to ensure that we aren't unintentionally consuming them from the
# previous make invocation.
KUBE_TEST_ARGS="${SHORT:--short=true} --vmodule=${KUBE_TEST_VMODULE} ${KUBE_TEST_ARGS}" \
WHAT="${WHAT:-$(kube::test::find_integration_test_dirs | paste -sd' ' -)}" \
GOFLAGS="${GOFLAGS:-}" \
KUBE_TEST_ARGS="${SHORT:--short=true} --vmodule=${KUBE_TEST_VMODULE} ${KUBE_TEST_ARGS:-}" \
KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
KUBE_RACE=""
KUBE_RACE="" \
MAKEFLAGS="" \
make -C "${KUBE_ROOT}" test
cleanup
}