From: Bram Moolenaar Date: Sun, 7 Feb 2016 20:44:49 +0000 (+0100) Subject: patch 7.4.1287 X-Git-Tag: v7.4.1287 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74f5e65bcc3d77ab879f56eb977f5038edccbcf8;p=vim 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 index 8fcc73b41..e5903ae42 100644 --- 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 index 6634f6086..a857cf1fc 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 */ +/**/ + 1287, /**/ 1286, /**/