# HG changeset patch # User Christian Brabandt # Date 1454877904 -3600 # Node ID c166ff6797cb478ef29b506cc5c93f32006ef01c # Parent e8ec58a726a3b77cdb372b4a9dbad792f855f911 commit https://github.com/vim/vim/commit/74f5e65bcc3d77ab879f56eb977f5038edccbcf8 Author: Bram Moolenaar Date: Sun Feb 7 21:44:49 2016 +0100 patch 7.4.1287 Problem: Channel test fails. Solution: Use reltimefloat(). diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -187,7 +187,7 @@ func Test_connect_waittime() call ch_close(handle) else let elapsed = reltime(start) - call assert_true(elapsed < 1.0) + call assert_true(reltimefloat(elapsed) < 1.0) endif let start = reltime() @@ -198,6 +198,6 @@ func Test_connect_waittime() else " Failed connection doesn't wait the full time. let elapsed = reltime(start) - call assert_true(elapsed < 1.0) + call assert_true(reltimefloat(elapsed) < 1.0) endif endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1287, +/**/ 1286, /**/ 1285,