patch 8.0.1631: testing with Vim running in terminal is a bit flaky

Problem:    Testing with Vim running in terminal is a bit flaky.
Solution:   Delete any .swp file so that later tests don't fail.

diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index 1016646c5bde5a67d4a4c9d029283183a0b8fe14..c84221580cbcb8b545fb3264cd23405b327dd95c 100644 (file)
--- 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 84f2a3e42dfe2693b767dfbe4cd1df655839b411..473883c99a13df20db9266b0b49e0188b69f2e8e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1631,
 /**/
     1630,
 /**/