Skip to content

Commit

Permalink
Some improvements to kubernetes#5687
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhiljindal committed Mar 26, 2015
1 parent aa417ca commit f56aa58
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
7 changes: 1 addition & 6 deletions hack/test-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hack/test-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f56aa58

Please sign in to comment.