diff options
author | ZyX <kp-pav@yandex.ru> | 2017-03-31 16:02:53 +0300 |
---|---|---|
committer | ZyX <kp-pav@yandex.ru> | 2017-03-31 16:06:17 +0300 |
commit | 2bf9d36ccd59f12e3895c885e8cf17e620bf191b (patch) | |
tree | d97b0806a79c1b6e55586c123966770027ad4cad /ci/common/build.sh | |
parent | 4d0f90f94db6040841b9987d02a021b785cfe0f3 (diff) | |
download | rneovim-2bf9d36ccd59f12e3895c885e8cf17e620bf191b.tar.gz rneovim-2bf9d36ccd59f12e3895c885e8cf17e620bf191b.tar.bz2 rneovim-2bf9d36ccd59f12e3895c885e8cf17e620bf191b.zip |
ci: Refactor CI scripts
1. CI_TARGET now determines which run_${CI_TARGET}.sh script to use. Defaults to
`tests`.
2. Build no longer halts on the first failing suit: e.g. if functional tests
failed it will continue with unit tests, etc.
3. All ${MAKE_CMD} occurrences moved to `top_make` function, added `build_make`
as an alias to `make -C build` (`"${MAKE_CMD}" -C "${BUILD_DIR}"`) which is
too verbose.
`suite.sh` was copied from powerline (tests/common.sh file), assumes running
with POSIX shells (and actually uses dash in powerline). Then some convenience
functions were added (run_test and below).
Diffstat (limited to 'ci/common/build.sh')
-rw-r--r-- | ci/common/build.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh index 44087513ee..19c23bdda8 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -1,3 +1,11 @@ +top_make() { + "${MAKE_CMD}" "$@" +} + +build_make() { + top_make -C "${BUILD_DIR}" "$@" +} + build_deps() { if [[ "${BUILD_32BIT}" == ON ]]; then DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" @@ -30,7 +38,7 @@ build_deps() { echo "Configuring with '${DEPS_CMAKE_FLAGS}'." CC= cmake ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/" - if ! ${MAKE_CMD}; then + if ! top_make; then exit 1 fi @@ -53,18 +61,18 @@ prepare_build() { build_nvim() { echo "Building nvim." - if ! ${MAKE_CMD} nvim; then + if ! top_make nvim; then exit 1 fi if [ "$CLANG_SANITIZER" != "TSAN" ]; then echo "Building libnvim." - if ! ${MAKE_CMD} libnvim; then + if ! top_make libnvim; then exit 1 fi echo "Building nvim-test." - if ! ${MAKE_CMD} nvim-test; then + if ! top_make nvim-test; then exit 1 fi fi |