patch 8.0.0403: GUI tests may fail

Problem:    GUI tests may fail.
Solution:   Ignore the E285 error better. (Kazunobu Kuriyama)

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index be3e52deb973dabd19b7979121663ceda351ea80..8817d8f2c7f9b36986c58fb1d08e541c79e7d613 100644 (file)
--- 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 a0922990e2ab21b61c6ac386e79b8bfa180f6920..811c6ecb23f381dd580dc45245a344fdb9f5a207 100644 (file)
--- 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 e10968785b38729066dc26a812b2cfbed72e8727..bef8df2b42d1654bbc702963343202277fe660f4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    403,
 /**/
     402,
 /**/