diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-07 21:44:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-07 21:44:49 +0100 |
| commit | 74f5e65bcc3d77ab879f56eb977f5038edccbcf8 (patch) | |
| tree | f525a2c9520c402ef1df03ddfe7b2a663d8fb9e3 | |
| parent | 7a84dbe6be0ef0e1ffbb7148cfe4ab50b9ba8f41 (diff) | |
patch 7.4.1287v7.4.1287
Problem: Channel test fails.
Solution: Use reltimefloat().
| -rw-r--r-- | src/testdir/test_channel.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 8fcc73b41e..e5903ae425 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 6634f60861..a857cf1fc6 100644 --- 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, |