summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-24 19:15:20 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-24 19:15:20 +0100
commitd6024e2dd4e0c1556d9b69e61c4059fa78e5609d (patch)
tree6a159fcbb6c6a700ada8bea67c109d35a6fecd08
parenta42df5934bdc1178ed2ee8cb9c8686975b578497 (diff)
downloadvim-git-d6024e2dd4e0c1556d9b69e61c4059fa78e5609d.tar.gz
patch 8.1.0631: test for :stop fails on Archv8.1.0631
Problem: Test for :stop fails on Arch. Solution: Check five lines for the expected output. (closes #3714)
-rw-r--r--src/testdir/test_terminal.vim6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index f31c221e1..71cf1b2c9 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1705,11 +1705,13 @@ func Test_stop_in_terminal()
call WaitForAssert({-> assert_match('ready', Get_terminal_text(bufnr, lastrow))})
call term_sendkeys(bufnr, ":stop\r")
- " Not sure where "Stopped" shows up, assume in the first three lines.
+ " Not sure where "Stopped" shows up, need five lines for Arch.
call WaitForAssert({-> assert_match('Stopped',
\ Get_terminal_text(bufnr, 1) .
\ Get_terminal_text(bufnr, 2) .
- \ Get_terminal_text(bufnr, 3))})
+ \ Get_terminal_text(bufnr, 3) .
+ \ Get_terminal_text(bufnr, 4) .
+ \ Get_terminal_text(bufnr, 5))})
call term_sendkeys(bufnr, "fg\r")
call term_sendkeys(bufnr, ":echo 'back again'\r")
diff --git a/src/version.c b/src/version.c
index 1b9e3e0dc..d53ffac0e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 631,
+/**/
630,
/**/
629,