Mercurial > vim
changeset 11028:4df1647531a6 v8.0.0403
patch 8.0.0403: GUI tests may fail
commit https://github.com/vim/vim/commit/24d7636e98b33ec6873c51fc72f6bf4b10188d8b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 4 13:32:10 2017 +0100
patch 8.0.0403: GUI tests may fail
Problem: GUI tests may fail.
Solution: Ignore the E285 error better. (Kazunobu Kuriyama)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 04 Mar 2017 13:45:04 +0100 |
| parents | ad18cd462fdd |
| children | 80594d56020f |
| files | src/testdir/test_gui.vim src/testdir/test_gui_init.vim src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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()