From 95f57dc886b706fa887cb691bc03b8139c37cdaf Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 16 Oct 2014 11:08:39 -0700 Subject: [PATCH] Clean up e2e more Don't early-terminate on test fail. Log which tests failed at the end. --- hack/e2e-test.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh index d680603a899..15594fc4693 100755 --- a/hack/e2e-test.sh +++ b/hack/e2e-test.sh @@ -70,7 +70,7 @@ if [[ ${LEAVE_UP} -ne 1 ]]; then fi TEST_PATTERN="${TEST_PATTERN:-}" -any_failed=0 +failed=() for test_file in $(ls "${KUBE_ROOT}/hack/e2e-suite/"); do if [[ "${TEST_PATTERN}" != "" ]]; then check=".*${TEST_PATTERN}.*" @@ -81,21 +81,21 @@ for test_file in $(ls "${KUBE_ROOT}/hack/e2e-suite/"); do fi echo "running $test_file" - "${KUBE_ROOT}/hack/e2e-suite/${test_file}" - result="$?" + result=0 + "${KUBE_ROOT}/hack/e2e-suite/${test_file}" || result="$?" if [[ "${result}" -eq "0" ]]; then echo "${test_file} returned ${result}; passed!" else echo "${test_file} returned ${result}; FAIL!" - any_failed=$((any_failed+1)) + failed+=(${test_file}) fi done echo -if [[ ${any_failed} -eq 0 ]]; then +if [[ "${#failed[*]}" -eq 0 ]]; then echo "Final: All tests passed." else - echo "Final: ${any_failed} tests failed." + echo "Final: ${#failed[@]} tests failed: ${failed[@]}." fi -exit ${any_failed} +exit "${#failed[@]}"