aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-07-30 20:52:00 -0400
committerJames McCoy <jamessan@jamessan.com>2017-07-30 21:07:41 -0400
commit347dd9476ae2c77ebfc96abda928a342f26fe677 (patch)
tree9901683e841c4c83a5b59b1475b606c4abd84706
parent13e8356f52d9dc1da96179ee425168740874c8c7 (diff)
downloadrneovim-347dd9476ae2c77ebfc96abda928a342f26fe677.tar.gz
rneovim-347dd9476ae2c77ebfc96abda928a342f26fe677.tar.bz2
rneovim-347dd9476ae2c77ebfc96abda928a342f26fe677.zip
oldtests: Run nvim using --headless to avoid requesting user input
Certain functions (e.g. feedkeys(…, 'x!') and input()) will attempt to read from stdin, which shouldn't be expected to work during oldtests. In Debian/Ubuntu's build environment, it explicitly can't work because /dev/null is redirected to stdin, which causes read_error_exit() to exit. Running oldtests with --headless prevents nvim from setting up its input handling, thus avoiding the problem altogether. Reference #6794
-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 510e8820f4..b45bd6ee14 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -132,7 +132,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(NVIM_PRG) test1.out
RM_ON_RUN := test.out X* viminfo
RM_ON_START := test.ok
-RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(NVIM_PRG) -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 --headless --noplugin -s dotest.in
clean:
-rm -rf *.out \
@@ -201,7 +201,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 = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(NVIM_PRG) -u unix.vim -U NONE --noplugin
+RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(NVIM_PRG) -u unix.vim -U NONE --headless --noplugin
newtests: newtestssilent
@/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \