aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2016-11-17 10:49:58 +0100
committerMarc André Tanner <mat@brain-dump.org>2016-11-17 10:49:58 +0100
commit8a3529541a6758ed6473d41837336b22b4f84406 (patch)
treea280cc6434d7d5eb6455eac489c2e212a8f1367d
parent2a8fc1f049b04a969e4bb73df817303a82925a11 (diff)
downloadvis-8a3529541a6758ed6473d41837336b22b4f84406.tar.gz
vis-8a3529541a6758ed6473d41837336b22b4f84406.tar.xz
test: use :qall! to terminate tests
This should make sure that vis always terminates and never hangs waiting for further input. Lua errors in particular cause a new window/file to be displayed showing a detailed error message. Previously only this internal file was closed but the original file remained open and prevented vis from exiting.
-rw-r--r--lua/visrc.lua2
-rwxr-xr-xvim/test.sh2
-rw-r--r--vis/visrc.lua2
3 files changed, 3 insertions, 3 deletions
diff --git a/lua/visrc.lua b/lua/visrc.lua
index 9210c26..ed23e60 100644
--- a/lua/visrc.lua
+++ b/lua/visrc.lua
@@ -9,5 +9,5 @@ vis.events.win_open = function(win)
lua_file = string.gsub(in_file, '%.in$', '.lua')
dofile(lua_file)
end
- vis:command('q!')
+ vis:command('qall!')
end
diff --git a/vim/test.sh b/vim/test.sh
index f031bb4..99a1c94 100755
--- a/vim/test.sh
+++ b/vim/test.sh
@@ -26,7 +26,7 @@ for t in $TESTS; do
printf "Running test %s with %s ... " "$t" "$e"
rm -f "$OUT" "$ERR"
[ "$e" = "$VIM" ] && EDITOR="$VIM -u NONE -U NONE -N -i NONE"
- { cat "$t.keys"; printf "<Escape>:wq! $OUT<Enter>\n"; } | cpp -P 2>/dev/null | sed 's/[ \t]*$//' | ../util/keys | $EDITOR "$t.in" 2> /dev/null
+ { cat "$t.keys"; printf "<Escape>:w! $OUT<Enter>:qall!<Enter>\n"; } | cpp -P 2>/dev/null | sed 's/[ \t]*$//' | ../util/keys | $EDITOR "$t.in" 2> /dev/null
if [ "$e" = "$VIM" ]; then
if [ -e "$REF" ]; then
if cmp -s "$REF" "$OUT"; then
diff --git a/vis/visrc.lua b/vis/visrc.lua
index a6ece31..ce5466d 100644
--- a/vis/visrc.lua
+++ b/vis/visrc.lua
@@ -13,5 +13,5 @@ vis.events.win_open = function(win)
vis:feedkeys(keys..'<Escape>')
vis:command(string.format("w! '%s.out'", name))
end
- vis:command('q!')
+ vis:command('qall!')
end