diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-23 20:37:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-23 20:37:45 +0100 |
| commit | 948a796bfea55d1e5a3a079d4976fdd4d093cd05 (patch) | |
| tree | a54dfd6a050db62e7bb5674ee1b883ffe5294449 | |
| parent | 295ac5ab5e840af6051bed5ec9d9acc3c73445de (diff) | |
| download | vim-git-948a796bfea55d1e5a3a079d4976fdd4d093cd05.tar.gz | |
patch 8.0.1631: testing with Vim running in terminal is a bit flakyv8.0.1631
Problem: Testing with Vim running in terminal is a bit flaky.
Solution: Delete any .swp file so that later tests don't fail.
| -rw-r--r-- | src/testdir/screendump.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim index 1016646c5..c84221580 100644 --- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -26,6 +26,10 @@ source shared.vim " " Options is a dictionary (not used yet). func RunVimInTerminal(arguments, options) + " If Vim doesn't exit a swap file remains, causing other tests to fail. + " Remove it here. + call delete(".swp") + " Make a horizontal and vertical split, so that we can get exactly the right " size terminal window. Works only when we currently have one window. call assert_equal(1, winnr('$')) diff --git a/src/version.c b/src/version.c index 84f2a3e42..473883c99 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1631, +/**/ 1630, /**/ 1629, |