summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-12-07 17:10:25 +0100
committerBram Moolenaar <Bram@vim.org>2019-12-07 17:10:25 +0100
commit08d2e795e72837a015e69894fb8ebd178e4014c9 (patch)
treeb41ccac57ab5db0636dc2216ba6f3db96401e512 /src
parent3c47e8384de62dd67748454a853677e32ee7842c (diff)
patch 8.1.2404: channel test fails under valgrindv8.1.2404
Problem: Channel test fails under valgrind. Solution: Sleep a bit longer.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_channel.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 5634b98c9f..17cdb7cac0 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1860,7 +1860,8 @@ func Test_job_exitval_and_termsig()
" Terminate job by signal
let cmd = ['sleep', '10']
let job = job_start(cmd)
- sleep 10m
+ " 10m usually works but 50m is needed when running Valgrind
+ sleep 50m
call job_stop(job)
call WaitForAssert({-> assert_equal("dead", job_status(job))})
let info = job_info(job)
diff --git a/src/version.c b/src/version.c
index f991cfb3a3..53b9538c17 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2404,
+/**/
2403,
/**/
2402,