Skip to content

Commit 24d7636

Browse files
committed
patch 8.0.0403: GUI tests may fail
Problem: GUI tests may fail. Solution: Ignore the E285 error better. (Kazunobu Kuriyama)
1 parent cf5fdf7 commit 24d7636

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/testdir/test_gui.vim

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,16 @@ func Test_quoteplus()
8585
let vim_exe = exepath(v:progpath)
8686
let testee = 'VIMRUNTIME=' . $VIMRUNTIME . '; export VIMRUNTIME;'
8787
\ . vim_exe
88-
\ . ' -f -g -u NONE -U NONE --noplugin --cmd ''%s'' -c ''%s'''
88+
\ . ' -u NONE -U NONE --noplugin --not-a-term -c ''%s'''
8989
" Ignore the "failed to create input context" error.
90-
let cmd1 = 'call test_ignore_error("E285")'
91-
let cmd2 = 'call feedkeys("'
90+
let cmd = 'call test_ignore_error("E285") | '
91+
\ . 'gui -f | '
92+
\ . 'call feedkeys("'
9293
\ . '\"+p'
9394
\ . ':s/' . test_call . '/' . test_response . '/\<CR>'
9495
\ . '\"+yis'
9596
\ . ':q!\<CR>", "tx")'
96-
let run_vimtest = printf(testee, cmd1, cmd2)
97+
let run_vimtest = printf(testee, cmd)
9798

9899
" Set the quoteplus register to test_call, and another gvim will launched.
99100
" Then, it first tries to paste the content of its own quotedplus register

src/testdir/test_gui_init.vim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ func TearDown()
1515
call GUITearDownCommon()
1616
endfunc
1717

18-
" Make sure that the tests will be done with the GUI activated.
18+
" Ignore the "failed to create input context" error.
19+
call test_ignore_error('E285')
20+
21+
" Start the GUI now, in the foreground.
1922
gui -f
2023

2124
func Test_set_guiheadroom()

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
403,
767769
/**/
768770
402,
769771
/**/

0 commit comments

Comments
 (0)