kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Travis: Fix accidental building of 3rd-party dependencies.

Browse Source 
Running tests from the top-level Makefile will use the third-party
dependencies from .deps instead of the ones from the Travis cache.
This commit is contained in:
Florian Walch 2016-07-17 13:26:00 +02:00
parent 66a4c95866
commit 3d1084f264
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.ci/common/test.sh
View File

@ -49,11 +49,11 @@ asan_check() {
} }
run_unittests() { run_unittests() {
${MAKE_CMD} unittest ${MAKE_CMD} -C "${BUILD_DIR}" unittest
} }
run_functionaltests() { run_functionaltests() {
if ! ${MAKE_CMD} ${FUNCTIONALTEST}; then if ! ${MAKE_CMD} -C "${BUILD_DIR}" ${FUNCTIONALTEST}; then
asan_check "${LOG_DIR}" asan_check "${LOG_DIR}"
valgrind_check "${LOG_DIR}" valgrind_check "${LOG_DIR}"
exit 1 exit 1
@ -63,7 +63,8 @@ run_functionaltests() {
} }
run_oldtests() { run_oldtests() {
if ! make oldtest; then ${MAKE_CMD} -C "${BUILD_DIR}" helptags
if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then
reset reset
asan_check "${LOG_DIR}" asan_check "${LOG_DIR}"
valgrind_check "${LOG_DIR}" valgrind_check "${LOG_DIR}"

2
Makefile
View File

@ -89,7 +89,7 @@ oldtest: | nvim helptags
+$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES) +$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES)
helptags: | nvim helptags: | nvim
+$(BUILD_CMD) -C build runtime/doc/tags +$(BUILD_CMD) -C build helptags
functionaltest: | nvim functionaltest: | nvim
+$(BUILD_CMD) -C build functionaltest +$(BUILD_CMD) -C build functionaltest