diff options
| -rw-r--r-- | .ci/common/test.sh | 7 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.ci/common/test.sh b/.ci/common/test.sh index 1e66ecb239..dc59f4f793 100644 --- a/.ci/common/test.sh +++ b/.ci/common/test.sh @@ -49,11 +49,11 @@ asan_check() { } run_unittests() { - ${MAKE_CMD} unittest + ${MAKE_CMD} -C "${BUILD_DIR}" unittest } run_functionaltests() { - if ! ${MAKE_CMD} ${FUNCTIONALTEST}; then + if ! ${MAKE_CMD} -C "${BUILD_DIR}" ${FUNCTIONALTEST}; then asan_check "${LOG_DIR}" valgrind_check "${LOG_DIR}" exit 1 @@ -63,7 +63,8 @@ run_functionaltests() { } run_oldtests() { - if ! make oldtest; then + ${MAKE_CMD} -C "${BUILD_DIR}" helptags + if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then reset asan_check "${LOG_DIR}" valgrind_check "${LOG_DIR}" @@ -89,7 +89,7 @@ oldtest: | nvim helptags +$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES) helptags: | nvim - +$(BUILD_CMD) -C build runtime/doc/tags + +$(BUILD_CMD) -C build helptags functionaltest: | nvim +$(BUILD_CMD) -C build functionaltest |