diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-06 20:51:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-06 20:51:52 +0200 |
| commit | 2d7260d66575052124b76c8b97b957319111bfef (patch) | |
| tree | 821227ba1e465adc129725b6cff8349497f55e04 | |
| parent | 94a7242ad1c41cc2a5377535f81d29a5b374b983 (diff) | |
| download | vim-git-2d7260d66575052124b76c8b97b957319111bfef.tar.gz | |
patch 8.1.1129: when making a new screendump test have to create the filev8.1.1129
Problem: When making a new screendump test have to create the file.
Solution: Continue creating the failed screendump, so it can be moved once
it is correct.
| -rw-r--r-- | src/testdir/screendump.vim | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 19 insertions, 8 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim index 2d317fe16..d97894281 100644 --- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -118,7 +118,12 @@ func VerifyScreenDump(buf, filename, options, ...) call delete(testfile) call term_dumpwrite(a:buf, testfile, a:options) let testdump = readfile(testfile) - let refdump = readfile(reference) + if filereadable(reference) + let refdump = readfile(reference) + else + " Must be a new screendump, always fail + let refdump = [] + endif if refdump == testdump call delete(testfile) if did_mkdir @@ -127,13 +132,17 @@ func VerifyScreenDump(buf, filename, options, ...) break endif if i == 100 - " Leave the test file around for inspection. - let msg = 'See dump file difference: call term_dumpdiff("' . testfile . '", "' . reference . '")' - 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) + " Leave the failed dump around for inspection. + if filereadable(reference) + let msg = 'See dump file difference: call term_dumpdiff("' . testfile . '", "' . reference . '")' + 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 + else + let msg = 'See new dump file: call term_dumpload("' . testfile . '")' endif for i in range(len(refdump)) if i >= len(testdump) diff --git a/src/version.c b/src/version.c index 51ae14c9e..5da9578bc 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1129, +/**/ 1128, /**/ 1127, |