diff options
| -rw-r--r-- | ci/common/suite.sh | 12 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/ci/common/suite.sh b/ci/common/suite.sh index 9c3056baaf..d13546823b 100644 --- a/ci/common/suite.sh +++ b/ci/common/suite.sh @@ -1,8 +1,6 @@ -# Test success marker. If END_MARKER file exists, we know that all tests -# finished. If FAIL_SUMMARY_FILE exists we know that some tests failed, this -# file will contain information about failed tests. Build is considered -# successful if tests ended without any of them failing. -END_MARKER="$BUILD_DIR/.tests_finished" +# If FAIL_SUMMARY_FILE exists we know that some tests failed, this file will +# contain information about failed tests. Build is considered successful if +# tests ended without any of them failing. FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors" fail() { @@ -28,9 +26,5 @@ ended_successfully() { return 1 fi - if ! test -f "${END_MARKER}" ; then - echo 'ended_successfully called before end marker was touched' - return 1 - fi return 0 } diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 0d39627dac..f04165d37a 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -35,8 +35,6 @@ build_nvim() { cd "${CI_BUILD_DIR}" } -rm -f "$END_MARKER" - # Run all tests (with some caveats) if no input argument is given if (($# == 0)); then tests=('build_nvim') @@ -58,7 +56,6 @@ for i in "${tests[@]}"; do eval "$i" || fail "$i" done -touch "${END_MARKER}" ended_successfully if [[ -s "${GCOV_ERROR_FILE}" ]]; then |