summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-13 16:53:49 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-13 16:53:49 +0200
commit55ba4b844f1b0e44f0f2e1bd14d26e7ad2df9ffc (patch)
tree0d546b2fee0ca7db2462008b82d51c90184f253d
parentef6b979bfae82f64781d8b0ce0194c57111243d4 (diff)
downloadvim-git-55ba4b844f1b0e44f0f2e1bd14d26e7ad2df9ffc.tar.gz
patch 8.2.0749: TERM signal test fails on FreeBSDv8.2.0749
Problem: TERM signal test fails on FreeBSD. Solution: Do not check the messages, the may appear anywhere. (Dominique Pelle, closes #6075)
-rw-r--r--src/testdir/test_signals.vim2
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/testdir/test_signals.vim b/src/testdir/test_signals.vim
index cb84f5e1a..0008e31fb 100644
--- a/src/testdir/test_signals.vim
+++ b/src/testdir/test_signals.vim
@@ -136,8 +136,6 @@ func Test_deadly_signal_TERM()
call assert_false(filereadable('Xsig_TERM'))
exe 'silent !kill -s TERM ' .. pid_vim
- call WaitForAssert({-> assert_equal('Vim: Caught deadly signal TERM', term_getline(buf, 1))})
- call WaitForAssert({-> assert_match('Vim: preserving files\.\.\.$', term_getline(buf, 2))})
call WaitForAssert({-> assert_true(filereadable('.Xsig_TERM.swp'))})
" Don't call StopVimInTerminal() as it expects job to be still running.
diff --git a/src/version.c b/src/version.c
index 7881e3211..dae935717 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 749,
+/**/
748,
/**/
747,