summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-31 17:48:19 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-31 17:48:19 +0200
commitf1699968baf3619a4147b44c891ba4a0985e7656 (patch)
treef3e4fed317ae16c6d499feb6319b25c3eae7066f
parent06fe74aef72606ac34c9f494186e52614b8fb59a (diff)
patch 8.1.1951: mouse double click test is a bit flakyv8.1.1951
Problem: Mouse double click test is a bit flaky. Solution: Add to list of flaky tests. Update a couple of comments.
-rw-r--r--src/testdir/runtest.vim1
-rw-r--r--src/testdir/shared.vim2
-rw-r--r--src/testdir/test_substitute.vim2
-rw-r--r--src/version.c2
4 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 1df7fd96a8..db6dcd7099 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -333,6 +333,7 @@ let s:flaky_tests = [
\ 'Test_raw_one_time_callback()',
\ 'Test_reltime()',
\ 'Test_server_crash()',
+ \ 'Test_term_mouse_double_click_to_create_tab',
\ 'Test_terminal_ansicolors_default()',
\ 'Test_terminal_ansicolors_func()',
\ 'Test_terminal_ansicolors_global()',
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index a4a7179de4..1032b45a35 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -272,7 +272,7 @@ func GetVimCommand(...)
return cmd
endfunc
-" Get the command to run Vim, with --clean.
+" Get the command to run Vim, with --clean instead of "-u NONE".
func GetVimCommandClean()
let cmd = GetVimCommand()
let cmd = substitute(cmd, '-u NONE', '--clean', '')
diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
index 344bb68da7..a263fb6211 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -504,7 +504,7 @@ func Test_sub_cmd_3()
call Run_SubCmd_Tests(tests)
endfunc
-" Test for submatch() on :substitue.
+" Test for submatch() on :substitute.
func Test_sub_cmd_4()
set magic&
set cpo&
diff --git a/src/version.c b/src/version.c
index 156f075139..00e82da91a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1951,
+/**/
1950,
/**/
1949,