diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-09-10 22:48:45 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-02-14 00:32:52 +0300 |
| commit | da2139296d1962c133920ec251e8d7597425ce1d (patch) | |
| tree | d2512f4b14a7daeaefbe38695845363fd5ef678e | |
| parent | 4a511de881efcf9b759c7babdeb0e31242d62c2e (diff) | |
| download | rneovim-da2139296d1962c133920ec251e8d7597425ce1d.tar.gz rneovim-da2139296d1962c133920ec251e8d7597425ce1d.tar.bz2 rneovim-da2139296d1962c133920ec251e8d7597425ce1d.zip | |
ci: Extract prepare_build() from build_nvim()
| -rw-r--r-- | .ci/common/build.sh | 8 | ||||
| -rwxr-xr-x | .ci/run_tests.sh | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.ci/common/build.sh b/.ci/common/build.sh index 5cf34935d6..44087513ee 100644 --- a/.ci/common/build.sh +++ b/.ci/common/build.sh @@ -37,7 +37,7 @@ build_deps() { cd "${TRAVIS_BUILD_DIR}" } -build_nvim() { +prepare_build() { if [[ -n "${CLANG_SANITIZER}" ]]; then CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON" fi @@ -47,9 +47,11 @@ build_nvim() { mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" - echo "Configuring with '${CMAKE_FLAGS}'." - cmake ${CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}" + echo "Configuring with '${CMAKE_FLAGS} $@'." + cmake ${CMAKE_FLAGS} "$@" "${TRAVIS_BUILD_DIR}" +} +build_nvim() { echo "Building nvim." if ! ${MAKE_CMD} nvim; then exit 1 diff --git a/.ci/run_tests.sh b/.ci/run_tests.sh index d542a2f121..d8e451a3c6 100755 --- a/.ci/run_tests.sh +++ b/.ci/run_tests.sh @@ -7,6 +7,7 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${CI_DIR}/common/build.sh" source "${CI_DIR}/common/test.sh" +prepare_build build_nvim if [ "$CLANG_SANITIZER" != "TSAN" ]; then |