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/script.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/script.sh')
| -rwxr-xr-x | ci/script.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ci/script.sh b/ci/script.sh index 79a1bec201..a59c40cd2d 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -3,16 +3,11 @@ set -e set -o pipefail -if [[ -n "${CI_TARGET}" ]]; then - make "${CI_TARGET}" - exit 0 -fi - # This will pass the environment variables down to a bash process which runs # as $USER, while retaining the environment variables defined and belonging # to secondary groups given above in usermod. if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - sudo -E su "${USER}" -c "ci/run_tests.sh" + sudo -E su "${USER}" -c "ci/run_${CI_TARGET}.sh" else - ci/run_tests.sh + ci/run_${CI_TARGET}.sh fi |