summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-21 17:05:59 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-21 17:05:59 +0100
commit353aca1215fad9c5413150a80df95ee3abb7e76a (patch)
treefdde75cb770460a52b9635ea33baad85a59d7267
parent4a7d2d3b407ed695450bb7f43166e2f2722a6836 (diff)
patch 8.1.0964: cannot see in CI why a screenshot test failedv8.1.0964
Problem: Cannot see in CI why a screenshot test failed. Solution: Add info about the failure.
-rw-r--r--src/testdir/screendump.vim15
-rw-r--r--src/version.c2
2 files changed, 16 insertions, 1 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index b46a477b73..cea0e1b17f 100644
--- 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 30a8081f00..a278e20b4b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 964,
+/**/
963,
/**/
962,