diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-29 20:36:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-29 20:36:56 +0100 |
| commit | 50948e4ac24314d5a70404bbc592ffc28755ad9f (patch) | |
| tree | bdbd6a06b8957ab794a9ebe5a4cb2404175febe5 | |
| parent | e0de2164f62a1736cdc64dbf804b77db8af90c10 (diff) | |
patch 8.1.0844: when timer fails test will hang foreverv8.1.0844
Problem: When timer fails test will hang forever.
Solution: Use reltime() to limit waiting time. (Ozaki Kiichi, closes #3878)
| -rw-r--r-- | src/testdir/test_timers.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index 2cea3e47da..78ec005676 100644 --- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -257,9 +257,11 @@ func Test_getchar_zero() return endif + " Measure the elapsed time to avoid a hang when it fails. + let start = reltime() let id = timer_start(20, {id -> feedkeys('x', 'L')}) let c = 0 - while c == 0 + while c == 0 && reltimefloat(reltime(start)) < 0.2 let c = getchar(0) sleep 10m endwhile diff --git a/src/version.c b/src/version.c index e78fde7dfb..cf7c47eb42 100644 --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 844, +/**/ 843, /**/ 842, |