forked from aniani/vim
patch 8.2.0382: some tests fail when run under valgrind
Problem: Some tests fail when run under valgrind. Solution: Increase timeouts.
This commit is contained in:
@@ -12,4 +12,4 @@
|
|||||||
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|⇲| +0#0000000#ffffff0@13
|
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|⇲| +0#0000000#ffffff0@13
|
||||||
|1|2| @72
|
|1|2| @72
|
||||||
|1|3| @72
|
|1|3| @72
|
||||||
|t|e|r|m|i|n|a|l| |p|o|p|u|p| @42|1|,|1| @10|T|o|p|
|
|t|e|r|m|i|n|a|l| |p|o|p|u|p| @60
|
||||||
|
@@ -12,4 +12,4 @@
|
|||||||
|1@1| @72
|
|1@1| @72
|
||||||
|1|2| @72
|
|1|2| @72
|
||||||
|1|3| @72
|
|1|3| @72
|
||||||
|"|[|N|o| |N|a|m|e|]|"| |[|M|o|d|i|f|i|e|d|]| |2|0| |l|i|n|e|s| |-@1|5|%|-@1| @18|1|,|1| @10|T|o|p|
|
|"|[|N|o| |N|a|m|e|]|"| |[|M|o|d|i|f|i|e|d|]| |l|i|n|e| |1| |o|f| |2|0| |-@1|5|%|-@1| |c|o|l| |1| @26
|
||||||
|
@@ -12,4 +12,4 @@
|
|||||||
|1@1| @11|╚+0&#a8a8a8255|═@44|⇲| +0&#ffffff0@13
|
|1@1| @11|╚+0&#a8a8a8255|═@44|⇲| +0&#ffffff0@13
|
||||||
|1|2| @72
|
|1|2| @72
|
||||||
|1|3| @72
|
|1|3| @72
|
||||||
@57|0|,|0|-|1| @8|A|l@1|
|
@75
|
||||||
|
@@ -12,4 +12,4 @@
|
|||||||
|1@1| @72
|
|1@1| @72
|
||||||
|1|2| @72
|
|1|2| @72
|
||||||
|1|3| @72
|
|1|3| @72
|
||||||
|:|c|a|l@1| |C|l|o|s|e|P|o|p|u|p|(|)| @38|1|,|1| @10|T|o|p|
|
|:|c|a|l@1| |C|l|o|s|e|P|o|p|u|p|(|)| @56
|
||||||
|
@@ -12,4 +12,4 @@
|
|||||||
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
|
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
|
||||||
|1|2| @72
|
|1|2| @72
|
||||||
|1|3| @72
|
|1|3| @72
|
||||||
@57|1|,|1| @10|A|l@1|
|
@75
|
||||||
|
@@ -12,4 +12,4 @@
|
|||||||
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
|
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
|
||||||
|1|2| @72
|
|1|2| @72
|
||||||
|1|3| @72
|
|1|3| @72
|
||||||
|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@34|6| @8|3|,|6| @10|A|l@1|
|
|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|6| @9
|
||||||
|
@@ -12,4 +12,4 @@
|
|||||||
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
|
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|╝| +0#0000000#ffffff0@13
|
||||||
|1|2| @72
|
|1|2| @72
|
||||||
|1|3| @72
|
|1|3| @72
|
||||||
@57|1|,|1| @10|T|o|p|
|
@75
|
||||||
|
@@ -12,4 +12,4 @@
|
|||||||
|1@1| @72
|
|1@1| @72
|
||||||
|1|2| @72
|
|1|2| @72
|
||||||
|1|3| @72
|
|1|3| @72
|
||||||
|:| @55|1|,|1| @10|T|o|p|
|
|:| @73
|
||||||
|
@@ -2283,7 +2283,7 @@ func Test_autocmd_CmdWinEnter()
|
|||||||
call term_sendkeys(buf, "q:")
|
call term_sendkeys(buf, "q:")
|
||||||
call term_wait(buf)
|
call term_wait(buf)
|
||||||
call term_sendkeys(buf, ":echo b:dummy_var\<cr>")
|
call term_sendkeys(buf, ":echo b:dummy_var\<cr>")
|
||||||
call WaitForAssert({-> assert_match('^This is a dummy', term_getline(buf, 6))}, 1000)
|
call WaitForAssert({-> assert_match('^This is a dummy', term_getline(buf, 6))}, 2000)
|
||||||
call term_sendkeys(buf, ":echo &buftype\<cr>")
|
call term_sendkeys(buf, ":echo &buftype\<cr>")
|
||||||
call WaitForAssert({-> assert_notmatch('^nofile', term_getline(buf, 6))}, 1000)
|
call WaitForAssert({-> assert_notmatch('^nofile', term_getline(buf, 6))}, 1000)
|
||||||
call term_sendkeys(buf, ":echo winnr\<cr>")
|
call term_sendkeys(buf, ":echo winnr\<cr>")
|
||||||
|
@@ -1999,15 +1999,15 @@ func Test_issue_5150()
|
|||||||
endif
|
endif
|
||||||
let g:job = job_start(cmd, {})
|
let g:job = job_start(cmd, {})
|
||||||
call job_stop(g:job)
|
call job_stop(g:job)
|
||||||
sleep 10m
|
sleep 50m
|
||||||
call assert_equal(-1, job_info(g:job).exitval)
|
call assert_equal(-1, job_info(g:job).exitval)
|
||||||
let g:job = job_start(cmd, {})
|
let g:job = job_start(cmd, {})
|
||||||
call job_stop(g:job, 'term')
|
call job_stop(g:job, 'term')
|
||||||
sleep 10m
|
sleep 50m
|
||||||
call assert_equal(-1, job_info(g:job).exitval)
|
call assert_equal(-1, job_info(g:job).exitval)
|
||||||
let g:job = job_start(cmd, {})
|
let g:job = job_start(cmd, {})
|
||||||
call job_stop(g:job, 'kill')
|
call job_stop(g:job, 'kill')
|
||||||
sleep 10m
|
sleep 50m
|
||||||
call assert_equal(-1, job_info(g:job).exitval)
|
call assert_equal(-1, job_info(g:job).exitval)
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@ source check.vim
|
|||||||
" If the expected output argument is supplied, then check for it.
|
" If the expected output argument is supplied, then check for it.
|
||||||
func RunDbgCmd(buf, cmd, ...)
|
func RunDbgCmd(buf, cmd, ...)
|
||||||
call term_sendkeys(a:buf, a:cmd . "\r")
|
call term_sendkeys(a:buf, a:cmd . "\r")
|
||||||
call term_wait(a:buf)
|
call term_wait(a:buf, 20)
|
||||||
|
|
||||||
if a:0 != 0
|
if a:0 != 0
|
||||||
" Verify the expected output
|
" Verify the expected output
|
||||||
|
@@ -429,7 +429,7 @@ func Test_pum_with_preview_win()
|
|||||||
let buf = RunVimInTerminal('-S Xpreviewscript', #{rows: 12})
|
let buf = RunVimInTerminal('-S Xpreviewscript', #{rows: 12})
|
||||||
call term_wait(buf, 100)
|
call term_wait(buf, 100)
|
||||||
call term_sendkeys(buf, "Gi\<C-X>\<C-O>")
|
call term_sendkeys(buf, "Gi\<C-X>\<C-O>")
|
||||||
call term_wait(buf, 100)
|
call term_wait(buf, 200)
|
||||||
call term_sendkeys(buf, "\<C-N>")
|
call term_sendkeys(buf, "\<C-N>")
|
||||||
call VerifyScreenDump(buf, 'Test_pum_with_preview_win', {})
|
call VerifyScreenDump(buf, 'Test_pum_with_preview_win', {})
|
||||||
|
|
||||||
|
@@ -2342,6 +2342,7 @@ func Test_terminal_in_popup()
|
|||||||
\ 'call setline(1, range(20))',
|
\ 'call setline(1, range(20))',
|
||||||
\ 'hi PopTerm ctermbg=grey',
|
\ 'hi PopTerm ctermbg=grey',
|
||||||
\ 'func OpenTerm(setColor)',
|
\ 'func OpenTerm(setColor)',
|
||||||
|
\ " set noruler",
|
||||||
\ " let s:buf = term_start('" .. cmd .. " Xtext', #{hidden: 1, term_finish: 'close'})",
|
\ " let s:buf = term_start('" .. cmd .. " Xtext', #{hidden: 1, term_finish: 'close'})",
|
||||||
\ ' let g:winid = popup_create(s:buf, #{minwidth: 45, minheight: 7, border: [], drag: 1, resize: 1})',
|
\ ' let g:winid = popup_create(s:buf, #{minwidth: 45, minheight: 7, border: [], drag: 1, resize: 1})',
|
||||||
\ ' if a:setColor',
|
\ ' if a:setColor',
|
||||||
@@ -2360,11 +2361,11 @@ func Test_terminal_in_popup()
|
|||||||
\ ]
|
\ ]
|
||||||
call writefile(lines, 'XtermPopup')
|
call writefile(lines, 'XtermPopup')
|
||||||
let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
|
let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
|
||||||
call term_wait(buf, 100)
|
call term_wait(buf, 200)
|
||||||
call term_sendkeys(buf, "\<C-L>")
|
|
||||||
call term_sendkeys(buf, ":call OpenTerm(0)\<CR>")
|
call term_sendkeys(buf, ":call OpenTerm(0)\<CR>")
|
||||||
call term_wait(buf, 100)
|
call term_wait(buf, 200)
|
||||||
call term_sendkeys(buf, ":\<CR>")
|
call term_sendkeys(buf, ":\<CR>")
|
||||||
|
call term_wait(buf, 200)
|
||||||
call term_sendkeys(buf, "\<C-W>:echo getwinvar(g:winid, \"&buftype\") win_gettype(g:winid)\<CR>")
|
call term_sendkeys(buf, "\<C-W>:echo getwinvar(g:winid, \"&buftype\") win_gettype(g:winid)\<CR>")
|
||||||
call VerifyScreenDump(buf, 'Test_terminal_popup_1', {})
|
call VerifyScreenDump(buf, 'Test_terminal_popup_1', {})
|
||||||
|
|
||||||
@@ -2372,6 +2373,7 @@ func Test_terminal_in_popup()
|
|||||||
call VerifyScreenDump(buf, 'Test_terminal_popup_2', {})
|
call VerifyScreenDump(buf, 'Test_terminal_popup_2', {})
|
||||||
|
|
||||||
call term_sendkeys(buf, ":call OpenTerm(1)\<CR>")
|
call term_sendkeys(buf, ":call OpenTerm(1)\<CR>")
|
||||||
|
call term_wait(buf, 300)
|
||||||
call term_sendkeys(buf, ":set hlsearch\<CR>")
|
call term_sendkeys(buf, ":set hlsearch\<CR>")
|
||||||
call term_sendkeys(buf, "/edit\<CR>")
|
call term_sendkeys(buf, "/edit\<CR>")
|
||||||
call VerifyScreenDump(buf, 'Test_terminal_popup_3', {})
|
call VerifyScreenDump(buf, 'Test_terminal_popup_3', {})
|
||||||
@@ -2397,7 +2399,7 @@ func Test_terminal_in_popup()
|
|||||||
|
|
||||||
call term_wait(buf, 100)
|
call term_wait(buf, 100)
|
||||||
call term_sendkeys(buf, ":q\<CR>")
|
call term_sendkeys(buf, ":q\<CR>")
|
||||||
call term_wait(buf, 100) " wait for terminal to vanish
|
call term_wait(buf, 200) " wait for terminal to vanish
|
||||||
|
|
||||||
call StopVimInTerminal(buf)
|
call StopVimInTerminal(buf)
|
||||||
call delete('Xtext')
|
call delete('Xtext')
|
||||||
@@ -2425,8 +2427,8 @@ func Test_terminal_in_popup_min_size()
|
|||||||
\ ]
|
\ ]
|
||||||
call writefile(lines, 'XtermPopup')
|
call writefile(lines, 'XtermPopup')
|
||||||
let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
|
let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
|
||||||
call term_wait(buf, 100)
|
call term_wait(buf, 200)
|
||||||
call term_sendkeys(buf, "\<C-L>")
|
call term_sendkeys(buf, ":set noruler\<CR>")
|
||||||
call term_sendkeys(buf, ":call OpenTerm()\<CR>")
|
call term_sendkeys(buf, ":call OpenTerm()\<CR>")
|
||||||
call term_wait(buf, 100)
|
call term_wait(buf, 100)
|
||||||
call term_sendkeys(buf, ":\<CR>")
|
call term_sendkeys(buf, ":\<CR>")
|
||||||
|
@@ -738,6 +738,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 */
|
||||||
|
/**/
|
||||||
|
382,
|
||||||
/**/
|
/**/
|
||||||
381,
|
381,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user