diff --git a/hack/test-go.sh b/hack/test-go.sh index eea976ef839..20b782d3be3 100755 --- a/hack/test-go.sh +++ b/hack/test-go.sh @@ -194,11 +194,6 @@ runTests() { kube::log::status "Combined coverage report: ${coverage_html_file}" } -runTestsForVersion() { - export KUBE_API_VERSION="$1" - runTests "${@:2}" -} - reportCoverageToCoveralls() { if [[ -x "${KUBE_GOVERALLS_BIN}" ]]; then ${KUBE_GOVERALLS_BIN} -coverprofile="${COMBINED_COVER_PROFILE}" || true @@ -209,7 +204,7 @@ reportCoverageToCoveralls() { IFS=',' read -a apiVersions <<< "${KUBE_TEST_API_VERSIONS}" for apiVersion in "${apiVersions[@]}"; do echo "Running tests for APIVersion: $apiVersion" - runTestsForVersion $apiVersion "${@}" + KUBE_API_VERSION="${apiVersion}" runTests "$@" done # We might run the tests for multiple versions, but we want to report only diff --git a/hack/test-integration.sh b/hack/test-integration.sh index 49c1decf19f..7799673b17a 100755 --- a/hack/test-integration.sh +++ b/hack/test-integration.sh @@ -55,7 +55,7 @@ runTests() { trap cleanup EXIT # Convert the CSV to an array of API versions to test -IFS=',' read -a apiVersions <<< ${KUBE_TEST_API_VERSIONS} +IFS=',' read -a apiVersions <<< "${KUBE_TEST_API_VERSIONS}" for apiVersion in "${apiVersions[@]}"; do - runTests $apiVersion + runTests "${apiVersion}" done