diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-09 18:11:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-09 18:11:00 +0200 |
| commit | 9d18961323a2a5c3b609c98ce0d78613c71f3532 (patch) | |
| tree | 8a5b482815a6c29c1c89b0462c1a5d3ede626640 | |
| parent | aba680a8513124e9556956115db4df35bd4a0e56 (diff) | |
patch 8.0.1082: tests fail when run under valgrindv8.0.1082
Problem: Tests fail when run under valgrind.
Solution: Increase waiting times.
| -rw-r--r-- | src/testdir/test_clientserver.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index 0f403711d9..811af138cd 100644 --- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -35,7 +35,8 @@ func Test_client_server() endif " Takes a short while for the server to be active. - call WaitFor('serverlist() =~ "' . name . '"') + " When using valgrind it takes much longer. + call WaitFor('serverlist() =~ "' . name . '"', 5000) call assert_match(name, serverlist()) call remote_foreground(name) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index efc491d92b..004c2c37fe 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -104,6 +104,15 @@ func! s:Nasty_exit_cb(job, st) let g:buf = 0 endfunc +func Get_cat_123_cmd() + if has('win32') + return 'cmd /c "cls && color 2 && echo 123"' + else + call writefile(["\<Esc>[32m123"], 'Xtext') + return "cat Xtext" + endif +endfunc + func Test_terminal_nasty_cb() let cmd = Get_cat_123_cmd() let g:buf = term_start(cmd, {'exit_cb': function('s:Nasty_exit_cb')}) @@ -143,15 +152,6 @@ func Check_123(buf) call assert_equal('123', l) endfunc -func Get_cat_123_cmd() - if has('win32') - return 'cmd /c "cls && color 2 && echo 123"' - else - call writefile(["\<Esc>[32m123"], 'Xtext') - return "cat Xtext" - endif -endfunc - func Test_terminal_scrape_123() let cmd = Get_cat_123_cmd() let buf = term_start(cmd) @@ -393,7 +393,6 @@ func Test_finish_open_close() call assert_equal(2, winnr('$')) call assert_equal(4, winheight(0)) bwipe - endfunc func Test_terminal_cwd() @@ -613,6 +612,7 @@ func Test_terminal_redir_file() call term_wait(buf) call WaitFor('len(readfile("Xfile")) > 0') call assert_match('executing job failed', readfile('Xfile')[0]) + call WaitFor('!&modified') call delete('Xfile') bwipe diff --git a/src/version.c b/src/version.c index 0018bce758..f2fde0055a 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1082, +/**/ 1081, /**/ 1080, |