diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-12 20:31:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-12 20:31:26 +0200 |
| commit | fc8aa6d02d85b0df703e0a790137891c91503c9e (patch) | |
| tree | d7a1d27bc4780e9cbf7349b8cedc7dc6b0fcc288 /src | |
| parent | 93be1644db2848659b0610477968c83f53619da1 (diff) | |
patch 8.2.1839: Vim9: memory leaks reported in assign testv8.2.1839
Problem: Vim9: memory leaks reported in assign test.
Solution: Move the failing job_start() call to separate test files, it
causes false leak reports.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/Make_all.mak | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_assign.vim | 11 | ||||
| -rw-r--r-- | src/testdir/test_vim9_fails.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 18 insertions, 7 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index eecc2e7fd3..c8ad66a8ba 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -34,6 +34,7 @@ TEST_VIM9 = \ test_vim9_cmd \ test_vim9_disassemble \ test_vim9_expr \ + test_vim9_fails \ test_vim9_func \ test_vim9_script @@ -42,6 +43,7 @@ TEST_VIM9_RES = \ test_vim9_cmd.res \ test_vim9_disassemble.res \ test_vim9_expr.res \ + test_vim9_fails.res \ test_vim9_func.res \ test_vim9_script.res diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 1b56df54b5..cf06b5cd89 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -75,7 +75,7 @@ def Test_assignment() if has('channel') var chan1: channel var job1: job - var job2: job = job_start('willfail') + # calling job_start() is in test_vim9_fails.vim, it causes leak reports endif if has('float') var float1: float = 3.4 @@ -216,12 +216,9 @@ def Test_assignment() CheckDefFailure(['v:errmsg += "more"'], 'E1051:') CheckDefFailure(['v:errmsg += 123'], 'E1012:') - # this should not leak - if 0 - var text =<< trim END - some text - END - endif + var text =<< trim END + some text + END enddef def Test_extend_list() diff --git a/src/testdir/test_vim9_fails.vim b/src/testdir/test_vim9_fails.vim new file mode 100644 index 0000000000..e09eb6543d --- /dev/null +++ b/src/testdir/test_vim9_fails.vim @@ -0,0 +1,10 @@ +" Test for Vim9 script with failures, causing memory leaks to be reported. +" The leaks happen after a fork() and can be ignored. + +def Test_assignment() + if has('channel') + var chan1: channel + var job1: job + var job2: job = job_start('willfail') + endif +enddef diff --git a/src/version.c b/src/version.c index 8f85e6b0e8..f972cbd641 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1839, +/**/ 1838, /**/ 1837, |