diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-09 18:16:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-09 18:16:43 +0200 |
| commit | 5b5adf5b9cd226d775643872e65c62674d6ada95 (patch) | |
| tree | 4b06972c0929cd46fd955b5a25e872727ffe450d /src/testdir | |
| parent | 9d18961323a2a5c3b609c98ce0d78613c71f3532 (diff) | |
patch 8.0.1083: leaking memory in input part of channelv8.0.1083
Problem: Leaking memory in input part of channel.
Solution: Clear the input part of channel. Free the entry. Move failing
command test to a separate file to avoid bogus leak reports
clouding tests that should not leak.
Diffstat (limited to 'src/testdir')
| -rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 8 | ||||
| -rw-r--r-- | src/testdir/test_terminal_fail.vim | 21 |
3 files changed, 22 insertions, 8 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index ad95b1b6e1..b979c975b7 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -194,6 +194,7 @@ NEW_TESTS = test_arabic.res \ test_system.res \ test_tcl.res \ test_terminal.res \ + test_terminal_fail.res \ test_textobjects.res \ test_undo.res \ test_usercommands.res \ diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 004c2c37fe..738c3d4de8 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -608,14 +608,6 @@ func Test_terminal_redir_file() endif if has('unix') - let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'}) - call term_wait(buf) - call WaitFor('len(readfile("Xfile")) > 0') - call assert_match('executing job failed', readfile('Xfile')[0]) - call WaitFor('!&modified') - call delete('Xfile') - bwipe - call writefile(['one line'], 'Xfile') let buf = term_start('cat', {'in_io': 'file', 'in_name': 'Xfile'}) call term_wait(buf) diff --git a/src/testdir/test_terminal_fail.vim b/src/testdir/test_terminal_fail.vim new file mode 100644 index 0000000000..aad4b98cb5 --- /dev/null +++ b/src/testdir/test_terminal_fail.vim @@ -0,0 +1,21 @@ +" This test is in a separate file, because it usually causes reports for memory +" leaks under valgrind. That is because when fork/exec fails memory is not +" freed. Since the process exists right away it's not a real leak. + +if !has('terminal') + finish +endif + +source shared.vim + +func Test_terminal_redir_fails() + if has('unix') + let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'}) + call term_wait(buf) + call WaitFor('len(readfile("Xfile")) > 0') + call assert_match('executing job failed', readfile('Xfile')[0]) + call WaitFor('!&modified') + call delete('Xfile') + bwipe + endif +endfunc |