OSDN > Finden Software > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

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.

diff -r 9bc62a5518fb -r c7843f009ecf src/search.c

--- a/src/search.c Mon Jun 01 21:15:04 2020 +0200

+++ b/src/search.c Mon Jun 01 21:45:03 2020 +0200

		@@ -36,7 +36,7 @@
36	36	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);
37	37	static void update_search_stat(int dirc, pos_T pos, pos_T cursor_pos, searchstat_T *stat, int recompute, int maxcount, long timeout);
38	38
39		-#define SEARCH_STAT_DEF_TIMEOUT 20L
	39	+#define SEARCH_STAT_DEF_TIMEOUT 40L
40	40	#define SEARCH_STAT_DEF_MAX_COUNT 99
41	41	#define SEARCH_STAT_BUF_LEN 12
42	42

diff -r 9bc62a5518fb -r c7843f009ecf src/testdir/test_search_stat.vim

--- a/src/testdir/test_search_stat.vim Mon Jun 01 21:15:04 2020 +0200

+++ b/src/testdir/test_search_stat.vim Mon Jun 01 21:45:03 2020 +0200

		@@ -87,10 +87,10 @@
87	87	\ searchcount(#{recompute: 0}))
88	88	call assert_equal(
89	89	\ #{current: 272, exact_match: 1, total: 280, incomplete: 0, maxcount: 0},
90		- \ searchcount(#{recompute: v:true, maxcount: 0}))
	90	+ \ searchcount(#{recompute: v:true, maxcount: 0, timeout: 200}))
91	91	call assert_equal(
92	92	\ #{current: 1, exact_match: 1, total: 280, incomplete: 0, maxcount: 0},
93		- \ searchcount(#{recompute: 1, maxcount: 0, pos: [1, 1, 0]}))
	93	+ \ searchcount(#{recompute: 1, maxcount: 0, pos: [1, 1, 0], timeout: 200}))
94	94	call cursor(line('$'), 1)
95	95	let g:a = execute(':unsilent :norm! n')
96	96	let stat = 'W \[1/>99\]'

		@@ -100,10 +100,10 @@
100	100	\ searchcount(#{recompute: 0}))
101	101	call assert_equal(
102	102	\ #{current: 1, exact_match: 1, total: 280, incomplete: 0, maxcount: 0},
103		- \ searchcount(#{recompute: 1, maxcount: 0}))
	103	+ \ searchcount(#{recompute: 1, maxcount: 0, timeout: 200}))
104	104	call assert_equal(
105	105	\ #{current: 271, exact_match: 1, total: 280, incomplete: 0, maxcount: 0},
106		- \ searchcount(#{recompute: 1, maxcount: 0, pos: [line('$')-2, 1, 0]}))
	106	+ \ searchcount(#{recompute: 1, maxcount: 0, pos: [line('$')-2, 1, 0], timeout: 200}))
107	107
108	108	" Many matches
109	109	call cursor(1, 1)

diff -r 9bc62a5518fb -r c7843f009ecf src/version.c

--- a/src/version.c Mon Jun 01 21:15:04 2020 +0200

+++ b/src/version.c Mon Jun 01 21:45:03 2020 +0200

		@@ -747,6 +747,8 @@
747	747	static int included_patches[] =
748	748	{ /* Add new patch number below this line */
749	749	/**/
	750	+ 884,
	751	+/**/
750	752	883,
751	753	/**/
752	754	882,