patch 8.1.0964: cannot see in CI why a screenshot test failed

Problem:    Cannot see in CI why a screenshot test failed.
Solution:   Add info about the failure.

diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index b46a477b73676f61916047f17cbc791a54000e25..cea0e1b17fa267073900fe85e94041eb77b36fd1 100644 (file)
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -111,7 +111,9 @@ func VerifyScreenDump(buf, filename, options, ...)
     sleep 10m
     call delete(testfile)
     call term_dumpwrite(a:buf, testfile, a:options)
-    if readfile(reference) == readfile(testfile)
+    let testdump = readfile(testfile)
+    let refdump = readfile(reference)
+    if refdump == testdump
       call delete(testfile)
       break
     endif
@@ -121,6 +123,17 @@ func VerifyScreenDump(buf, filename, options, ...)
       if a:0 == 1
         let msg = a:1 . ': ' . msg
       endif
+      if len(testdump) != len(refdump)
+       let msg = msg . '; line count is ' . len(testdump) . ' instead of ' . len(refdump)
+      endif
+      for i in range(len(refdump))
+       if i >= len(testdump)
+         break
+       endif
+       if testdump[i] != refdump[i]
+         let msg = msg . '; difference in line ' . (i + 1) . ': "' . testdump[i] . '"'
+       endif
+      endfor
       call assert_report(msg)
       return 1
     endif

diff --git a/src/version.c b/src/version.c
index 30a8081f0076ef59b33d4cddfe53f864e65c67fe..a278e20b4b1eb696b2d51a9333f018443cceea0b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    964,
 /**/
     963,
 /**/