thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0884: searchcount() test fails on slower systems

Browse Source 
Problem:    Searchcount() test fails on slower systems.
Solution:   Set a longer timeout.
This commit is contained in:
Bram Moolenaar
2020-06-01 21:32:45 +02:00
parent 5fbf3bc3f9
commit ea6561af92
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/search.c
View File

@@ -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 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); 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_DEF_MAX_COUNT 99
#define SEARCH_STAT_BUF_LEN 12 #define SEARCH_STAT_BUF_LEN 12

8
src/testdir/test_search_stat.vim
View File

@@ -87,10 +87,10 @@ func Test_search_stat()
\ searchcount(#{recompute: 0})) \ searchcount(#{recompute: 0}))
call assert_equal( call assert_equal(
\ #{current: 272, exact_match: 1, total: 280, incomplete: 0, maxcount: 0}, \ #{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( call assert_equal(
\ #{current: 1, exact_match: 1, total: 280, incomplete: 0, maxcount: 0}, \ #{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) call cursor(line('$'), 1)
let g:a = execute(':unsilent :norm! n') let g:a = execute(':unsilent :norm! n')
let stat = 'W \[1/>99\]' let stat = 'W \[1/>99\]'
@@ -100,10 +100,10 @@ func Test_search_stat()
\ searchcount(#{recompute: 0})) \ searchcount(#{recompute: 0}))
call assert_equal( call assert_equal(
\ #{current: 1, exact_match: 1, total: 280, incomplete: 0, maxcount: 0}, \ #{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( call assert_equal(
\ #{current: 271, exact_match: 1, total: 280, incomplete: 0, maxcount: 0}, \ #{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 " Many matches
call cursor(1, 1) call cursor(1, 1)

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
884,
/**/ /**/
883, 883,
/**/ /**/