summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-26 21:11:58 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-26 21:11:58 +0100
commit26bde6e2eb307898ab7ed42bf8e7e2ccde979e02 (patch)
treebb1a3d1d1c499e7b214c28f9a9ced524e28bafc3
parent72749f062f15c7147f512bc581695c25ad78fb4e (diff)
patch 8.2.0457: Test_quotestar() often fails when run under valgrindv8.2.0457
Problem: Test_quotestar() often fails when run under valgrind. Solution: Wait longer for the GUI to start.
-rw-r--r--src/testdir/test_quotestar.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index 432862e875..93865869fa 100644
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -107,7 +107,8 @@ func Do_test_quotestar_for_x11()
call remote_send(name, ":gui -f\<CR>")
endif
" Wait for the server in the GUI to be up and answering requests.
- call WaitForAssert({-> assert_match("1", remote_expr(name, "has('gui_running')", "", 1))})
+ " On some systems and with valgrind this can be very slow.
+ call WaitForAssert({-> assert_match("1", remote_expr(name, "has('gui_running')", "", 1))}, 10000)
call remote_send(name, ":let @* = 'maybe'\<CR>")
call WaitForAssert({-> assert_equal("maybe", remote_expr(name, "@*", "", 2))})
diff --git a/src/version.c b/src/version.c
index 2d29430b59..4ae2b516d2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 457,
+/**/
456,
/**/
455,