mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-10 03:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Do not use oldtest target on Travis. (#6101)

Browse Source 
We must invoke src/nvim/testdir/Makefile directly.
Explained in 3d1084f264:
> Running tests from the top-level Makefile will use the third-party
> dependencies from .deps instead of the ones from the Travis cache.

If we could run `oldtest` with CMake, we would not need to do this. Need
USES_TERMINAL feature (CMake 3.2+) for that.
This commit is contained in:
Justin M. Keyes
2017-02-13 15:07:49 +01:00
committed by GitHub
parent b5965bbd24
commit 4a511de881
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.ci/common/test.sh
View File

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

15
src/nvim/testdir/Makefile
View File

@@ -2,11 +2,12 @@
# Makefile to run all tests for Vim # Makefile to run all tests for Vim
# #
export SHELL := sh NVIM_PRG ?= ../../../build/bin/nvim
VIMPROG ?= $(NVIM_PRG)
SCRIPTSOURCE := ../../../runtime SCRIPTSOURCE := ../../../runtime
export SHELL := sh
export NVIM_PRG := $(NVIM_PRG)
SCRIPTS ?= \ SCRIPTS ?= \
test13.out \ test13.out \
test14.out \ test14.out \
@@ -101,13 +102,13 @@ report:
echo ALL DONE; \ echo ALL DONE; \
fi" fi"
test1.out: $(VIMPROG) test1.out: $(NVIM_PRG)
$(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) test1.out $(SCRIPTS) $(SCRIPTS_GUI): $(NVIM_PRG) test1.out
RM_ON_RUN := test.out X* viminfo RM_ON_RUN := test.out X* viminfo
RM_ON_START := test.ok RM_ON_START := test.ok
RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(VIMPROG) -u unix.vim -U NONE -i viminfo --noplugin -s dotest.in RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --noplugin -s dotest.in
clean: clean:
-rm -rf *.out \ -rm -rf *.out \
@@ -176,7 +177,7 @@ nolog:
# New style of tests uses Vim script with assert calls. These are easier # New style of tests uses Vim script with assert calls. These are easier
# to write and a lot easier to read and debug. # to write and a lot easier to read and debug.
# Limitation: Only works with the +eval feature. # Limitation: Only works with the +eval feature.
RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(NVIM_PRG) -u unix.vim -U NONE --noplugin
newtests: newtestssilent newtests: newtestssilent
@/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \ @/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \