diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-04 13:32:10 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-04 13:32:10 +0100 |
| commit | 24d7636e98b33ec6873c51fc72f6bf4b10188d8b (patch) | |
| tree | 7645fcd92436848fcbd098afb0e132d7f4a33b1d | |
| parent | cf5fdf7d1689ecb145b634dcb9c6e9fc60f63869 (diff) | |
| download | vim-git-24d7636e98b33ec6873c51fc72f6bf4b10188d8b.tar.gz | |
patch 8.0.0403: GUI tests may failv8.0.0403
Problem: GUI tests may fail.
Solution: Ignore the E285 error better. (Kazunobu Kuriyama)
| -rw-r--r-- | src/testdir/test_gui.vim | 9 | ||||
| -rw-r--r-- | src/testdir/test_gui_init.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index be3e52deb..8817d8f2c 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -85,15 +85,16 @@ func Test_quoteplus() let vim_exe = exepath(v:progpath) let testee = 'VIMRUNTIME=' . $VIMRUNTIME . '; export VIMRUNTIME;' \ . vim_exe - \ . ' -f -g -u NONE -U NONE --noplugin --cmd ''%s'' -c ''%s''' + \ . ' -u NONE -U NONE --noplugin --not-a-term -c ''%s''' " Ignore the "failed to create input context" error. - let cmd1 = 'call test_ignore_error("E285")' - let cmd2 = 'call feedkeys("' + let cmd = 'call test_ignore_error("E285") | ' + \ . 'gui -f | ' + \ . 'call feedkeys("' \ . '\"+p' \ . ':s/' . test_call . '/' . test_response . '/\<CR>' \ . '\"+yis' \ . ':q!\<CR>", "tx")' - let run_vimtest = printf(testee, cmd1, cmd2) + let run_vimtest = printf(testee, cmd) " Set the quoteplus register to test_call, and another gvim will launched. " Then, it first tries to paste the content of its own quotedplus register diff --git a/src/testdir/test_gui_init.vim b/src/testdir/test_gui_init.vim index a0922990e..811c6ecb2 100644 --- a/src/testdir/test_gui_init.vim +++ b/src/testdir/test_gui_init.vim @@ -15,7 +15,10 @@ func TearDown() call GUITearDownCommon() endfunc -" Make sure that the tests will be done with the GUI activated. +" Ignore the "failed to create input context" error. +call test_ignore_error('E285') + +" Start the GUI now, in the foreground. gui -f func Test_set_guiheadroom() diff --git a/src/version.c b/src/version.c index e10968785..bef8df2b4 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 403, +/**/ 402, /**/ 401, |