aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2018-10-14 19:23:46 -0400
committerJustin M. Keyes <justinkz@gmail.com>2018-10-14 16:23:46 -0700
commit8fd092f3ff15bf70f84ec0d716c5aaa2c7379fa1 (patch)
tree36e47b4ecafee752f7ff86a2c46a95132c03a7d4
parente568ac7a68d3b7a05af34d931fad1d2c18fa396c (diff)
downloadrneovim-8fd092f3ff15bf70f84ec0d716c5aaa2c7379fa1.tar.gz
rneovim-8fd092f3ff15bf70f84ec0d716c5aaa2c7379fa1.tar.bz2
rneovim-8fd092f3ff15bf70f84ec0d716c5aaa2c7379fa1.zip
vim-patch:8.1.0476: memory leaks in test_escaped_glob (#9127)
Problem: Memory leaks in test_escaped_glob. Solution: Avoid failure when running the shell, use the sandbox. https://github.com/vim/vim/commit/a2aad028305c306ecf33e0fd720fe1ed98596371
-rw-r--r--src/nvim/testdir/test_escaped_glob.vim17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/nvim/testdir/test_escaped_glob.vim b/src/nvim/testdir/test_escaped_glob.vim
index eaeac28d61..aad3a1e835 100644
--- a/src/nvim/testdir/test_escaped_glob.vim
+++ b/src/nvim/testdir/test_escaped_glob.vim
@@ -2,8 +2,6 @@
" characters.
function SetUp()
- " make sure glob() doesn't use the shell
- set shell=doesnotexist
" consistent sorting of file names
set nofileignorecase
endfunction
@@ -14,20 +12,23 @@ function Test_glob()
" filenames. Disable the test on non-Unix systems for now.
return
endif
- call assert_equal("", glob('Xxx\{'))
- call assert_equal("", glob('Xxx\$'))
+
+ " Execute these commands in the sandbox, so that using the shell fails.
+ " Setting 'shell' to an invalid name causes a memory leak.
+ sandbox call assert_equal("", glob('Xxx\{'))
+ sandbox call assert_equal("", glob('Xxx\$'))
w! Xxx{
" } to fix highlighting
w! Xxx\$
- call assert_equal("Xxx{", glob('Xxx\{'))
- call assert_equal("Xxx$", glob('Xxx\$'))
+ sandbox call assert_equal("Xxx{", glob('Xxx\{'))
+ sandbox call assert_equal("Xxx$", glob('Xxx\$'))
call delete('Xxx{')
call delete('Xxx$')
endfunction
function Test_globpath()
- call assert_equal(expand("sautest/autoload/globone.vim\nsautest/autoload/globtwo.vim"),
+ sandbox call assert_equal(expand("sautest/autoload/globone.vim\nsautest/autoload/globtwo.vim"),
\ globpath('sautest/autoload', 'glob*.vim'))
- call assert_equal([expand('sautest/autoload/globone.vim'), expand('sautest/autoload/globtwo.vim')],
+ sandbox call assert_equal([expand('sautest/autoload/globone.vim'), expand('sautest/autoload/globtwo.vim')],
\ globpath('sautest/autoload', 'glob*.vim', 0, 1))
endfunction