commit ef7f0e367eeaf6fb31b1caa0e3de1a4b07e86af3
author Bram Moolenaar <Bram@vim.org> Sat Mar 30 15:59:51 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Mar 30 15:59:51 2019 +0100
tree 61cbe5caf5d62317402704e6e21d3b05265d4c6f
parent 48aed0824e47147faf19fc235ad4bcf851584c9c

patch 8.1.1080: when a screendump test fails, moving the file is a hassle

Problem:    When a screendump test fails, moving the file is a hassle.
Solution:   Instead of appending ".failed" to the file name, keep the same
            file name but put the screendump in the "failed" directory.
            Then the file name only needs to be typed once when moving a
            screendump.

src/testdir/screendump.vim

diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index cea0e1b..2d317fe 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -103,7 +103,13 @@
 " Returns non-zero when verification fails.
 func VerifyScreenDump(buf, filename, options, ...)
   let reference = 'dumps/' . a:filename . '.dump'
-  let testfile = a:filename . '.dump.failed'
+  let testfile = 'failed/' . a:filename . '.dump'
+
+  let did_mkdir = 0
+  if !isdirectory('failed')
+    let did_mkdir = 1
+    call mkdir('failed')
+  endif
 
   let i = 0
   while 1
@@ -115,6 +121,9 @@
     let refdump = readfile(reference)
     if refdump == testdump
       call delete(testfile)
+      if did_mkdir
+	call delete('failed', 'd')
+      endif
       break
     endif
     if i == 100

src/version.c

diff --git a/src/version.c b/src/version.c
index d8a65cd..508736a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -776,6 +776,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1080,
+/**/
     1079,
 /**/
     1078,