aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordundargoc <33953936+dundargoc@users.noreply.github.com>2023-02-08 18:32:17 +0100
committerGitHub <noreply@github.com>2023-02-08 18:32:17 +0100
commit2294210660056df2f8abb277776cfd68f3fb1156 (patch)
tree7ac269dc2d7794ba88d3d7723eecb760cbf28c06 /src
parenteebed91d11dd225e56011ae1dbc152db66429d52 (diff)
downloadrneovim-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 'src')
-rwxr-xr-xsrc/nvim/testdir/runnvim.sh1
-rw-r--r--src/nvim/testdir/suite.sh26
-rw-r--r--src/nvim/testdir/test.sh11
3 files changed, 10 insertions, 28 deletions
diff --git a/src/nvim/testdir/runnvim.sh b/src/nvim/testdir/runnvim.sh
index f316c7376e..4d8ea0527d 100755
--- a/src/nvim/testdir/runnvim.sh
+++ b/src/nvim/testdir/runnvim.sh
@@ -26,7 +26,6 @@ main() {(
export BUILD_DIR
export FAILED=0
- . $(dirname $0)/suite.sh
. $(dirname $0)/test.sh
# Redirect XDG_CONFIG_HOME so users local config doesn't interfere
diff --git a/src/nvim/testdir/suite.sh b/src/nvim/testdir/suite.sh
index 3059773ca1..bf5a16fd89 100644
--- a/src/nvim/testdir/suite.sh
+++ b/src/nvim/testdir/suite.sh
@@ -1,10 +1,3 @@
-# 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"
-FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors"
-
fail() {
local test_name="$1"
local message="$2"
@@ -12,25 +5,6 @@ fail() {
: "${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
- if ! test -f "${END_MARKER}" ; then
- echo 'ended_successfully called before end marker was touched'
- return 1
- fi
- return 0
-}
diff --git a/src/nvim/testdir/test.sh b/src/nvim/testdir/test.sh
index eab1736c32..affdc308d1 100644
--- a/src/nvim/testdir/test.sh
+++ b/src/nvim/testdir/test.sh
@@ -1,4 +1,13 @@
-. $(dirname $0)/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"
+ export FAILED=1
+}
print_core() {
local app="$1"