summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-27 19:41:02 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-27 19:41:02 +0100
commit9207d1f523c2e2fb1c8749ec6f84ab5ecc2c62f4 (patch)
tree10470ff85bbe3b42cbc6c9a2945b5a7bc069e2b3
parentbd5e622bfa12bd80a5ce9406704205400e3faa6a (diff)
patch 8.2.0461: confirm test fails on amd64 systemv8.2.0461
Problem: Confirm test fails on amd64 system. (Alimar Riesebieter) Solution: Add an extra WaitForAssert(). (Dominique Pelle)
-rw-r--r--src/testdir/test_excmd.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index ec252a660b..d5588d670a 100644
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -264,6 +264,8 @@ func Test_confirm_cmd_cancel()
call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
\ term_getline(buf, 20))}, 1000)
call term_sendkeys(buf, "N")
+ call WaitForAssert({-> assert_match('^ *0,0-1 All$',
+ \ term_getline(buf, 20))}, 1000)
call StopVimInTerminal(buf)
endfunc
diff --git a/src/version.c b/src/version.c
index 758895465a..001770e75f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 461,
+/**/
460,
/**/
459,