ci: simplify CI process
This commit is contained in:
parent
dcbf9f93e9
commit
fa192e97d5
|
@ -8,8 +8,6 @@ _stat() {
|
|||
|
||||
top_make() {
|
||||
printf '%78s\n' | tr ' ' '='
|
||||
# Travis has 1.5 virtual cores according to:
|
||||
# http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM
|
||||
ninja "$@"
|
||||
}
|
||||
|
||||
|
|
|
@ -73,13 +73,8 @@ fail() {
|
|||
|
||||
run_test() {
|
||||
local cmd="$1"
|
||||
test $# -gt 0 && shift
|
||||
local test_name="$1"
|
||||
: ${test_name:=$cmd}
|
||||
test $# -gt 0 && shift
|
||||
if ! eval "$cmd" ; then
|
||||
fail "${test_name}" "$@"
|
||||
fi
|
||||
local test_name="$2"
|
||||
eval "$cmd" || fail "$test_name"
|
||||
}
|
||||
|
||||
ended_successfully() {
|
||||
|
@ -99,3 +94,13 @@ end_tests() {
|
|||
touch "${END_MARKER}"
|
||||
ended_successfully
|
||||
}
|
||||
|
||||
run_suite() {
|
||||
local command="$1"
|
||||
local suite_name="$2"
|
||||
|
||||
enter_suite "$suite_name"
|
||||
run_test "$command" "$suite_name"
|
||||
exit_suite --continue
|
||||
}
|
||||
|
||||
|
|
|
@ -182,8 +182,3 @@ install_nvim() {(
|
|||
|
||||
exit_suite
|
||||
)}
|
||||
|
||||
csi_clean() {
|
||||
find "${BUILD_DIR}/bin" -name 'test-includes-*' -delete
|
||||
find "${BUILD_DIR}" -name '*test-include*.o' -delete
|
||||
}
|
||||
|
|
|
@ -8,24 +8,10 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|||
source "${CI_DIR}/common/build.sh"
|
||||
source "${CI_DIR}/common/suite.sh"
|
||||
|
||||
enter_suite 'clint'
|
||||
run_test 'make clint-full' clint
|
||||
exit_suite --continue
|
||||
|
||||
enter_suite 'lualint'
|
||||
run_test 'make lualint' lualint
|
||||
exit_suite --continue
|
||||
|
||||
enter_suite 'pylint'
|
||||
run_test 'make pylint' pylint
|
||||
exit_suite --continue
|
||||
|
||||
enter_suite 'shlint'
|
||||
run_test 'make shlint' shlint
|
||||
exit_suite --continue
|
||||
|
||||
enter_suite single-includes
|
||||
run_test 'make check-single-includes' single-includes
|
||||
exit_suite --continue
|
||||
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'
|
||||
|
||||
end_tests
|
||||
|
|
|
@ -23,13 +23,13 @@ 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_test run_unittests
|
||||
run_test run_unittests unittests
|
||||
fi
|
||||
run_test run_functionaltests
|
||||
run_test run_functionaltests functionaltests
|
||||
fi
|
||||
run_test run_oldtests
|
||||
run_test run_oldtests oldtests
|
||||
|
||||
run_test install_nvim
|
||||
run_test install_nvim install_nvim
|
||||
|
||||
exit_suite --continue
|
||||
|
||||
|
|
Loading…
Reference in New Issue