aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-10-31 10:23:58 +0100
committerGitHub <noreply@github.com>2018-10-31 10:23:58 +0100
commit61fccda197b9719afac73756ea85245c3c895e10 (patch)
tree304c7e925e571ade63cf97502dc985dd55b90c6e
parent0838b002531390d0f18a309fa5ef07e3abfb1e69 (diff)
downloadrneovim-61fccda197b9719afac73756ea85245c3c895e10.tar.gz
rneovim-61fccda197b9719afac73756ea85245c3c895e10.tar.bz2
rneovim-61fccda197b9719afac73756ea85245c3c895e10.zip
test/old: force "-i viminfo" in $RUN_VIMTEST #9175 (#9175)
Before this change, some tests fail if the user has a local shada/viminfo in the default $HOME location. For example: TEST_FILE=test_marks.res make oldtest Ostensibly this change should not be necessary, because of this statement in runtest.vim: set viminfo+=nviminfo
-rw-r--r--src/nvim/testdir/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 9a83a46add..fac27aa346 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -48,7 +48,7 @@ NEW_TESTS_IGNORE := $(NEW_TESTS_IN_ALOT) $(NEW_TESTS_ALOT) \
test_listlbr \
test_largefile \
-NEW_TESTS = $(addsuffix .res,$(sort $(filter-out $(NEW_TESTS_IGNORE),$(basename $(notdir $(wildcard test_*.vim))))) $(NEW_TESTS_ALOT))
+NEW_TESTS ?= $(addsuffix .res,$(sort $(filter-out $(NEW_TESTS_IGNORE),$(basename $(notdir $(wildcard test_*.vim))))) $(NEW_TESTS_ALOT))
SCRIPTS_GUI := test16.out
@@ -153,7 +153,7 @@ nolog:
# New style of tests uses Vim script with assert calls. These are easier
# to write and a lot easier to read and debug.
# Limitation: Only works with the +eval feature.
-RUN_VIMTEST = $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE --headless --noplugin
+RUN_VIMTEST = $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --headless --noplugin
newtests: newtestssilent
@/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \