aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-09-19 10:51:10 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-09-19 10:57:57 -0400
commitdf46f9197764b92e596ad6a5a8c297edc51dd6f6 (patch)
treea3f9e4fa5232e643e30bb2253b0d09e3bbc7ab54
parent17106b96e9c61ba8710b84c3fdd718e85f8a8365 (diff)
downloadrneovim-df46f9197764b92e596ad6a5a8c297edc51dd6f6.tar.gz
rneovim-df46f9197764b92e596ad6a5a8c297edc51dd6f6.tar.bz2
rneovim-df46f9197764b92e596ad6a5a8c297edc51dd6f6.zip
vim-patch:8.1.2263: 'noesckeys' test fails in GUI
Problem: 'noesckeys' test fails in GUI. Solution: Skip the test in the GUI. https://github.com/vim/vim/commit/215ba3b63698f3755b2c4de66fc728cc14a8a590 Cherry-pick "CheckNotGui" command from patch 8.1.1826.
-rw-r--r--src/nvim/testdir/check.vim8
-rw-r--r--src/nvim/testdir/test_edit.vim5
2 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim
index 073873bcb0..e0ebe8fd49 100644
--- a/src/nvim/testdir/check.vim
+++ b/src/nvim/testdir/check.vim
@@ -65,3 +65,11 @@ func CheckCanRunGui()
throw 'Skipped: cannot start the GUI'
endif
endfunc
+
+" Command to check that not currently using the GUI
+command CheckNotGui call CheckNotGui()
+func CheckNotGui()
+ if has('gui_running')
+ throw 'Skipped: only works in the terminal'
+ endif
+endfunc
diff --git a/src/nvim/testdir/test_edit.vim b/src/nvim/testdir/test_edit.vim
index a863a254b6..dbe12fc8fc 100644
--- a/src/nvim/testdir/test_edit.vim
+++ b/src/nvim/testdir/test_edit.vim
@@ -1,9 +1,11 @@
" Test for edit functions
-"
+
if exists("+t_kD")
let &t_kD="[3;*~"
endif
+source check.vim
+
" Needed for testing basic rightleft: Test_edit_rightleft
source view_util.vim
@@ -1516,6 +1518,7 @@ func Test_edit_startinsert()
endfunc
func Test_edit_noesckeys()
+ CheckNotGui
new
" <Left> moves cursor when 'esckeys' is set