aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-08-17 18:29:13 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-08-17 18:32:40 -0400
commit454adf15db07eebd4509e0256f4e20ef06db1d6e (patch)
tree6c682fc14248acd0b5ee5bf723a221f67f4652ff
parenteb3ec78c6343b1795d7e1aa8ad4f22649dffb604 (diff)
downloadrneovim-454adf15db07eebd4509e0256f4e20ef06db1d6e.tar.gz
rneovim-454adf15db07eebd4509e0256f4e20ef06db1d6e.tar.bz2
rneovim-454adf15db07eebd4509e0256f4e20ef06db1d6e.zip
vim-patch:8.1.1839: insufficient info when test fails because of screen size
Problem: Insufficient info when test fails because of screen size. Solution: Report the detected screen size. https://github.com/vim/vim/commit/0b5dc644465c549ac54fe3c4ad232dd692000d26
-rw-r--r--src/nvim/testdir/runtest.vim6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 4eddad8ad5..152fb93ca6 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -31,12 +31,14 @@
" Check that the screen size is at least 24 x 80 characters.
if &lines < 24 || &columns < 80
- let error = 'Screen size too small! Tests require at least 24 lines with 80 characters'
+ let error = 'Screen size too small! Tests require at least 24 lines with 80 characters, got ' .. &lines .. ' lines with ' .. &columns .. ' characters'
echoerr error
split test.log
$put =error
write
split messages
+ call append(line('$'), '')
+ call append(line('$'), 'From ' . expand('%') . ':')
call append(line('$'), error)
write
qa!
@@ -161,7 +163,7 @@ func RunTheTest(test)
endtry
endif
- " Clear any autocommands
+ " Clear any autocommands and put back the catch-all for SwapExists.
au!
au SwapExists * call HandleSwapExists()