Mercurial > vim
changeset 20661:c7843f009ecf v8.2.0884
patch 8.2.0884: searchcount() test fails on slower systems
Commit: https://github.com/vim/vim/commit/ea6561af92eeb26fa0b4966575da7cadd98af1cd
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 1 21:32:45 2020 +0200
patch 8.2.0884: searchcount() test fails on slower systems
Problem: Searchcount() test fails on slower systems.
Solution: Set a longer timeout.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 01 Jun 2020 21:45:03 +0200 |
parents | 9bc62a5518fb |
children | 0e498c32ebad |
files | src/search.c src/testdir/test_search_stat.vim src/version.c |
diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -36,7 +36,7 @@ typedef struct searchstat static void cmdline_search_stat(int dirc, pos_T *pos, pos_T *cursor_pos, int show_top_bot_msg, char_u *msgbuf, int recompute, int maxcount, long timeout); static void update_search_stat(int dirc, pos_T *pos, pos_T *cursor_pos, searchstat_T *stat, int recompute, int maxcount, long timeout); -#define SEARCH_STAT_DEF_TIMEOUT 20L +#define SEARCH_STAT_DEF_TIMEOUT 40L #define SEARCH_STAT_DEF_MAX_COUNT 99 #define SEARCH_STAT_BUF_LEN 12
--- a/src/testdir/test_search_stat.vim +++ b/src/testdir/test_search_stat.vim @@ -87,10 +87,10 @@ func Test_search_stat() \ searchcount(#{recompute: 0})) call assert_equal( \ #{current: 272, exact_match: 1, total: 280, incomplete: 0, maxcount: 0}, - \ searchcount(#{recompute: v:true, maxcount: 0})) + \ searchcount(#{recompute: v:true, maxcount: 0, timeout: 200})) call assert_equal( \ #{current: 1, exact_match: 1, total: 280, incomplete: 0, maxcount: 0}, - \ searchcount(#{recompute: 1, maxcount: 0, pos: [1, 1, 0]})) + \ searchcount(#{recompute: 1, maxcount: 0, pos: [1, 1, 0], timeout: 200})) call cursor(line('$'), 1) let g:a = execute(':unsilent :norm! n') let stat = 'W \[1/>99\]' @@ -100,10 +100,10 @@ func Test_search_stat() \ searchcount(#{recompute: 0})) call assert_equal( \ #{current: 1, exact_match: 1, total: 280, incomplete: 0, maxcount: 0}, - \ searchcount(#{recompute: 1, maxcount: 0})) + \ searchcount(#{recompute: 1, maxcount: 0, timeout: 200})) call assert_equal( \ #{current: 271, exact_match: 1, total: 280, incomplete: 0, maxcount: 0}, - \ searchcount(#{recompute: 1, maxcount: 0, pos: [line('$')-2, 1, 0]})) + \ searchcount(#{recompute: 1, maxcount: 0, pos: [line('$')-2, 1, 0], timeout: 200})) " Many matches call cursor(1, 1)