diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-04 16:24:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-04 16:24:57 +0100 |
| commit | 23d44493f1e82365f0a1dbd372fc2546811942f4 (patch) | |
| tree | e031f14f5edc1cfd74498ecfaef46ad96823de27 | |
| parent | 51d04d16f21e19d6eded98f9530d84089102f925 (diff) | |
patch 8.2.4862: Vim9: test may fail when run with valgrindv8.2.4862
Problem: Vim9: test may fail when run with valgrind.
Solution: Wait longer for callback if needed.
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 4a01daa39e..23b3502ce7 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -3707,6 +3707,7 @@ def Test_no_unknown_error_after_error() enddef def Exit_cb(...l: list<any>) sleep 1m + g:did_call_exit_cb = true source += l enddef var myjob = job_start('echo burp', {out_cb: Out_cb, exit_cb: Exit_cb, mode: 'raw'}) @@ -3714,7 +3715,13 @@ def Test_no_unknown_error_after_error() sleep 10m endwhile # wait for Exit_cb() to be called - sleep 200m + for x in range(100) + if exists('g:did_call_exit_cb') + unlet g:did_call_exit_cb + break + endif + sleep 10m + endfor END writefile(lines, 'Xdef') assert_fails('so Xdef', ['E684:', 'E1012:']) diff --git a/src/version.c b/src/version.c index 51db458263..5277fef5ea 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 */ /**/ + 4862, +/**/ 4861, /**/ 4860, |