ci: remove function run_suite
This commit is contained in:
parent
7a0fd7a288
commit
d47714d87c
|
@ -38,11 +38,3 @@ end_tests() {
|
|||
touch "${END_MARKER}"
|
||||
ended_successfully
|
||||
}
|
||||
|
||||
run_suite() {
|
||||
local command="$1"
|
||||
local suite_name="$2"
|
||||
|
||||
rm -f "${END_MARKER}"
|
||||
eval "$command" || fail "$suite_name"
|
||||
}
|
||||
|
|
|
@ -8,30 +8,32 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|||
source "${CI_DIR}/common/build.sh"
|
||||
source "${CI_DIR}/common/suite.sh"
|
||||
|
||||
rm -f "$END_MARKER"
|
||||
|
||||
if [[ "$GITHUB_ACTIONS" != "true" ]]; then
|
||||
run_suite 'make clint-full' 'clint'
|
||||
run_suite 'make lualint' 'lualint'
|
||||
run_suite 'make pylint' 'pylint'
|
||||
run_suite 'make shlint' 'shlint'
|
||||
run_suite 'make check-single-includes' 'single-includes'
|
||||
make clint-full || fail 'clint'
|
||||
make lualint || fail 'lualint'
|
||||
make pylint || fail 'pylint'
|
||||
make shlint || fail 'shlint'
|
||||
make check-single-includes || fail 'single-includes'
|
||||
|
||||
end_tests
|
||||
else
|
||||
case "$1" in
|
||||
clint)
|
||||
run_suite 'make clint-full' 'clint'
|
||||
make clint-full || fail 'clint'
|
||||
;;
|
||||
lualint)
|
||||
run_suite 'make lualint' 'lualint'
|
||||
make lualint || fail 'lualint'
|
||||
;;
|
||||
pylint)
|
||||
run_suite 'make pylint' 'pylint'
|
||||
make pylint || fail 'pylint'
|
||||
;;
|
||||
shlint)
|
||||
run_suite 'make shlint' 'shlint'
|
||||
make shlint || fail 'shlint'
|
||||
;;
|
||||
single-includes)
|
||||
run_suite 'make check-single-includes' 'single-includes'
|
||||
make check-single-includes || fail 'single-includes'
|
||||
;;
|
||||
*)
|
||||
:;;
|
||||
|
|
|
@ -8,38 +8,39 @@ source "${CI_DIR}/common/build.sh"
|
|||
source "${CI_DIR}/common/test.sh"
|
||||
source "${CI_DIR}/common/suite.sh"
|
||||
|
||||
rm -f "$END_MARKER"
|
||||
|
||||
if [[ "$GITHUB_ACTIONS" != "true" ]]; then
|
||||
run_suite 'build_nvim' 'build'
|
||||
build_nvim || fail 'build'
|
||||
|
||||
if test "$CLANG_SANITIZER" != "TSAN"; then
|
||||
# Additional threads are only created when the builtin UI starts, which
|
||||
# doesn't happen in the unit/functional tests
|
||||
if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then
|
||||
run_suite run_unittests unittests
|
||||
run_unittests || fail 'unittests'
|
||||
fi
|
||||
run_suite run_functionaltests functionaltests
|
||||
run_functionaltests || fail 'functionaltests'
|
||||
fi
|
||||
run_suite run_oldtests oldtests
|
||||
run_suite install_nvim install_nvim
|
||||
run_oldtests || fail 'oldtests'
|
||||
install_nvim || fail 'install_nvim'
|
||||
|
||||
end_tests
|
||||
else
|
||||
case "$1" in
|
||||
build)
|
||||
run_suite 'build_nvim' 'build'
|
||||
build_nvim || fail 'build'
|
||||
;;
|
||||
unittests)
|
||||
run_suite 'run_unittests' 'unittests'
|
||||
run_unittests || fail 'unittests'
|
||||
;;
|
||||
functionaltests)
|
||||
run_suite 'run_functionaltests' 'functionaltests'
|
||||
run_functionaltests || fail 'functionaltests'
|
||||
;;
|
||||
oldtests)
|
||||
run_suite 'run_oldtests' 'oldtests'
|
||||
run_oldtests || fail 'oldtests'
|
||||
;;
|
||||
install_nvim)
|
||||
run_suite 'install_nvim' 'install_nvim'
|
||||
install_nvim || fail 'install_nvim'
|
||||
;;
|
||||
*)
|
||||
:;;
|
||||
|
|
Loading…
Reference in New Issue