diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-11-19 21:32:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 21:32:48 -0800 |
| commit | 182d3cebcf9831c0c8150be974dde3dd98251969 (patch) | |
| tree | 5f81cecdae577c488642a0c465fd51fe55f14bf8 /src/nvim/testdir | |
| parent | 629ea19994d832a7de806e451941dd4904bcc5ed (diff) | |
| parent | 756e2b5f65c6ffda50719f874d16c20f98027798 (diff) | |
| download | rneovim-182d3cebcf9831c0c8150be974dde3dd98251969.tar.gz rneovim-182d3cebcf9831c0c8150be974dde3dd98251969.tar.bz2 rneovim-182d3cebcf9831c0c8150be974dde3dd98251969.zip | |
Merge #11426 from janlazo/vim-8.0.1449
vim-patch:8.0.{1449,1793}
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/shared.vim | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim index 84f636077d..a5d83d6a25 100644 --- a/src/nvim/testdir/shared.vim +++ b/src/nvim/testdir/shared.vim @@ -252,6 +252,8 @@ func GetVimProg() endif endfunc +let g:valgrind_cnt = 1 + " Get the command to run Vim, with -u NONE and --headless arguments. " If there is an argument use it instead of "NONE". func GetVimCommand(...) @@ -267,6 +269,13 @@ func GetVimCommand(...) endif let cmd .= ' --headless -i NONE' let cmd = substitute(cmd, 'VIMRUNTIME=.*VIMRUNTIME;', '', '') + + " If using valgrind, make sure every run uses a different log file. + if cmd =~ 'valgrind.*--log-file=' + let cmd = substitute(cmd, '--log-file=\(^\s*\)', '--log-file=\1.' . g:valgrind_cnt, '') + let g:valgrind_cnt += 1 + endif + return cmd endfunc @@ -290,9 +299,6 @@ endfunc func RunVimPiped(before, after, arguments, pipecmd) let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log' let cmd = GetVimCommand() - if cmd == '' - return 0 - endif let args = '' if len(a:before) > 0 call writefile(a:before, 'Xbefore.vim') |