diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-02-08 18:32:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 18:32:17 +0100 |
| commit | 2294210660056df2f8abb277776cfd68f3fb1156 (patch) | |
| tree | 7ac269dc2d7794ba88d3d7723eecb760cbf28c06 /ci/common | |
| parent | eebed91d11dd225e56011ae1dbc152db66429d52 (diff) | |
| download | rneovim-2294210660056df2f8abb277776cfd68f3fb1156.tar.gz rneovim-2294210660056df2f8abb277776cfd68f3fb1156.tar.bz2 rneovim-2294210660056df2f8abb277776cfd68f3fb1156.zip | |
ci: remove fail summary (#22174)
The tests already have a summary at the end, there's no need for an
additional fail summary wrapper.
Diffstat (limited to 'ci/common')
| -rw-r--r-- | ci/common/suite.sh | 30 | ||||
| -rw-r--r-- | ci/common/test.sh | 14 |
2 files changed, 11 insertions, 33 deletions
diff --git a/ci/common/suite.sh b/ci/common/suite.sh deleted file mode 100644 index d13546823b..0000000000 --- a/ci/common/suite.sh +++ /dev/null @@ -1,30 +0,0 @@ -# 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() { - local test_name="$1" - local message="$2" - - : "${message:=Test $test_name failed}" - - local full_msg="$test_name :: $message" - echo "${full_msg}" >> "${FAIL_SUMMARY_FILE}" - echo "Failed: $full_msg" - export FAILED=1 -} - -ended_successfully() { - if test -f "${FAIL_SUMMARY_FILE}" ; then - echo 'Test failed, complete summary:' - cat "${FAIL_SUMMARY_FILE}" - - if [[ "$GITHUB_ACTIONS" == "true" ]]; then - rm -f "$FAIL_SUMMARY_FILE" - fi - - return 1 - fi - return 0 -} diff --git a/ci/common/test.sh b/ci/common/test.sh index c3b8d45b9f..f6e20d8f59 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -1,4 +1,13 @@ -. "${CI_DIR}/common/suite.sh" +fail() { + local test_name="$1" + local message="$2" + + : "${message:=Test $test_name failed}" + + local full_msg="$test_name :: $message" + echo "Failed: $full_msg" + exit 1 +} submit_coverage() { if [ -n "${GCOV}" ]; then @@ -124,7 +133,7 @@ check_runtime_files() {( local message="$1" ; shift local tst="$1" ; shift - cd runtime + cd runtime || exit for file in $(git ls-files "$@") ; do # Check that test is not trying to work with files with spaces/etc # Prefer failing the build over using more robust construct because files @@ -141,7 +150,6 @@ check_runtime_files() {( install_nvim() {( if ! ninja -C "${BUILD_DIR}" install; then fail 'install' 'make install failed' - exit 1 fi "${INSTALL_PREFIX}/bin/nvim" --version |