diff options
Diffstat (limited to 'src/testdir/term_util.vim')
| -rw-r--r-- | src/testdir/term_util.vim | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim index df7cfa54cf..7c071bb3f8 100644 --- a/src/testdir/term_util.vim +++ b/src/testdir/term_util.vim @@ -107,16 +107,18 @@ func RunVimInTerminal(arguments, options) call TermWait(buf) - " Wait for "All" or "Top" of the ruler to be shown in the last line or in - " the status line of the last window. This can be quite slow (e.g. when - " using valgrind). - " If it fails then show the terminal contents for debugging. - try - call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1 || len(term_getline(buf, rows - statusoff)) >= cols - 1}) - catch /timed out after/ - let lines = map(range(1, rows), {key, val -> term_getline(buf, val)}) - call assert_report('RunVimInTerminal() failed, screen contents: ' . join(lines, "<NL>")) - endtry + if get(a:options, 'wait_for_ruler', 1) + " Wait for "All" or "Top" of the ruler to be shown in the last line or in + " the status line of the last window. This can be quite slow (e.g. when + " using valgrind). + " If it fails then show the terminal contents for debugging. + try + call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1 || len(term_getline(buf, rows - statusoff)) >= cols - 1}) + catch /timed out after/ + let lines = map(range(1, rows), {key, val -> term_getline(buf, val)}) + call assert_report('RunVimInTerminal() failed, screen contents: ' . join(lines, "<NL>")) + endtry + endif " Starting a terminal to run Vim is always considered flaky. let g:test_is_flaky = 1 |