aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/Makefile8
-rw-r--r--src/nvim/testdir/test49.vim2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 55ee653a1e..799eeed7d8 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -4,10 +4,10 @@
export SHELL := sh
-VIMPROG := ../../../build/bin/nvim
+VIMPROG ?= $(NVIM_PRG)
SCRIPTSOURCE := ../../../runtime
-SCRIPTS := \
+SCRIPTS ?= \
test13.out \
test14.out \
test17.out \
@@ -25,9 +25,9 @@ SCRIPTS := \
test79.out \
test_marks.out \
-# Tests using runtest.vim.vim.
+# Tests using runtest.vim.
# Keep test_alot*.res as the last one, sort the others.
-NEW_TESTS = \
+NEW_TESTS ?= \
test_bufwintabinfo.res \
test_cmdline.res \
test_cscope.res \
diff --git a/src/nvim/testdir/test49.vim b/src/nvim/testdir/test49.vim
index edd49a2b63..adbabd61b9 100644
--- a/src/nvim/testdir/test49.vim
+++ b/src/nvim/testdir/test49.vim
@@ -456,7 +456,7 @@ function! ExtraVim(...)
" messing up the user's viminfo file.
let redirect = a:0 ?
\ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
- exec "!echo '" . debug_quits . "q' | ../../../build/bin/nvim -u NONE -N -es" . redirect .
+ exec "!echo '" . debug_quits . "q' | $NVIM_PRG -u NONE -N -es" . redirect .
\ " -c 'debuggreedy|set viminfo+=nviminfo'" .
\ " -c 'let ExtraVimBegin = " . extra_begin . "'" .
\ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .