diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-15 18:29:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-15 18:29:18 +0200 |
| commit | 657a826c07b4ea3f8846b6acb2c50b82c2d81e50 (patch) | |
| tree | 333d01ed81293ae509ffb62478ae004bc5907fcb | |
| parent | 02f9e6a60f9851046154ccf2ac170f25a0b3cc7d (diff) | |
| download | vim-git-657a826c07b4ea3f8846b6acb2c50b82c2d81e50.tar.gz | |
patch 8.2.1222: using valgrind in Vim command started by test doesn't workv8.2.1222
Problem: When using valgrind a Vim command started by a test uses the same
log file name which gets overwritten.
Solution: Fix regexp to rename the log file.
| -rw-r--r-- | src/testdir/shared.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index bbd28be1c..c7dd41f20 100644 --- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -268,7 +268,7 @@ func GetVimCommand(...) " 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 cmd = substitute(cmd, '--log-file=\(\S*\)', '--log-file=\1.' . g:valgrind_cnt, '') let g:valgrind_cnt += 1 endif diff --git a/src/version.c b/src/version.c index f0cfe69a3..558a73e84 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1222, +/**/ 1221, /**/ 1220, |