diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-22 22:23:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-22 22:23:40 +0200 |
| commit | c69950ac17225d07f973b39d5b0eb94291077808 (patch) | |
| tree | 89264030369d5c76b933bd5e0777d0c239c212cb | |
| parent | 4cdb13ce81309b62b636f2c614241959174d3fef (diff) | |
| download | vim-git-c69950ac17225d07f973b39d5b0eb94291077808.tar.gz | |
patch 8.2.1273: MS-Windows: terminal test may leave file behindv8.2.1273
Problem: MS-Windows: terminal test may leave file behind.
Solution: Wait a moment for process to end before deleting the file.
(Taro Muraoka, closes #6513)
| -rw-r--r-- | src/testdir/test_terminal.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 067fa0f09..fcc11565c 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -808,6 +808,13 @@ func Test_terminal_redir_file() endif let g:job = term_getjob(buf) call WaitForAssert({-> assert_equal("dead", job_status(g:job))}) + + if has('win32') + " On Windows we cannot delete a file being used by a process. When + " job_status() returns "dead", the process remains for a short time. + " Just wait for a moment. + sleep 50m + endif call delete('Xfile') bwipe diff --git a/src/version.c b/src/version.c index 36951df40..ed8f6c468 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 */ /**/ + 1273, +/**/ 1272, /**/ 1271, |