summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-24 20:11:59 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-24 20:11:59 +0100
commite9b74c03618e2dcd01cd71f8d62d620fbce884fa (patch)
tree0fb38eb3ad57e25b96768617a3c4064b41d04dcc
parenta315ce1f326b836167ca8b1037dafd93eb8d4d4e (diff)
downloadvim-git-e9b74c03618e2dcd01cd71f8d62d620fbce884fa.tar.gz
patch 8.2.5156: search timeout test often fails with FreeBSDv8.2.5156
Problem: Search timeout test often fails with FreeBSD. Solution: Double the maximum time.
-rw-r--r--src/testdir/test_search.vim4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 5422b33f6..c12c07b33 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -379,6 +379,10 @@ func Test_searchpair_timeout_with_skip()
if RunningWithValgrind()
let max_time += 0.04 " this can be slow with valgrind
endif
+ if has('bsd')
+ " test often fails with FreeBSD
+ let max_time = max_time * 2.0
+ endif
endif
let start = reltime()
let found = searchpair('(', '', ')', 'crnm', 'SearchpairSkip()', 0, ms)
diff --git a/src/version.c b/src/version.c
index 4f9d8913a..b13e4ce3f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5156,
+/**/
5155,
/**/
5154,