mirror of
https://github.com/neovim/neovim.git
synced 2025-10-22 17:11:49 +00:00
ci: remove variable NVIM_TEST_CURRENT_SUITE
We always know where in the test we are anyway, it's just needless repetition.
This commit is contained in:
@@ -14,16 +14,13 @@ FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors"
|
|||||||
enter_suite() {
|
enter_suite() {
|
||||||
FAILED=0
|
FAILED=0
|
||||||
rm -f "${END_MARKER}"
|
rm -f "${END_MARKER}"
|
||||||
local suite_name="$1"
|
|
||||||
export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE}/$suite_name"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
exit_suite() {
|
exit_suite() {
|
||||||
if test $FAILED -ne 0 ; then
|
if test $FAILED -ne 0 ; then
|
||||||
echo "Suite ${NVIM_TEST_CURRENT_SUITE} failed, summary:"
|
echo "Test failed, summary:"
|
||||||
echo "${FAIL_SUMMARY}"
|
echo "${FAIL_SUMMARY}"
|
||||||
fi
|
fi
|
||||||
export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE%/*}"
|
|
||||||
FAILED=0
|
FAILED=0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +30,7 @@ fail() {
|
|||||||
|
|
||||||
: ${message:=Test $test_name failed}
|
: ${message:=Test $test_name failed}
|
||||||
|
|
||||||
local full_msg="$NVIM_TEST_CURRENT_SUITE|$test_name :: $message"
|
local full_msg="$test_name :: $message"
|
||||||
FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}"
|
FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}"
|
||||||
echo "${full_msg}" >> "${FAIL_SUMMARY_FILE}"
|
echo "${full_msg}" >> "${FAIL_SUMMARY_FILE}"
|
||||||
echo "Failed: $full_msg"
|
echo "Failed: $full_msg"
|
||||||
@@ -67,8 +64,7 @@ run_suite() {
|
|||||||
local command="$1"
|
local command="$1"
|
||||||
local suite_name="$2"
|
local suite_name="$2"
|
||||||
|
|
||||||
enter_suite "$suite_name"
|
enter_suite
|
||||||
eval "$command" || fail "$suite_name"
|
eval "$command" || fail "$suite_name"
|
||||||
exit_suite
|
exit_suite
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user