summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-08 20:58:25 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-08 20:58:25 +0200
commit999224422633935eaa8b804ce3d1c2f9ca195d0a (patch)
treed8c9852e06c0b13a7fe9a0b46b957c25e7a74101 /src
parentee9e604124682b0cd89e4f987a2f6f3fe4160920 (diff)
patch 8.1.1651: suspend test is flaky on some systemsv8.1.1651
Problem: Suspend test is flaky on some systems. Solution: Wait for the shell prompt to show. (Yee Cheng Chin, closes #4632)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_suspend.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index 8b326f51f6..4b3bd5eadf 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -54,6 +54,8 @@ func Test_suspend()
" Quit gracefully to dump coverage information.
call term_sendkeys(buf, ":qall!\<CR>")
call term_wait(buf)
+ " Wait until Vim actually exited and shell shows a prompt
+ call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
call StopShellInTerminal(buf)
exe buf . 'bwipe!'
diff --git a/src/version.c b/src/version.c
index 6ad48828b7..cbfee049c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1651,
+/**/
1650,
/**/
1649,