Skip to content

Commit

Permalink
ci: remove unnecessary END_MARKER variable (neovim#22171)
Browse files Browse the repository at this point in the history
  • Loading branch information
dundargoc authored Feb 8, 2023
1 parent 3074ae6 commit 0fc9a23
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
12 changes: 3 additions & 9 deletions ci/common/suite.sh
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -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
}
3 changes: 0 additions & 3 deletions ci/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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
Expand Down

0 comments on commit 0fc9a23

Please sign in to comment.