summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-20 21:25:46 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-20 21:25:46 +0200
commitf1e0544d413b8b2ea129db0655b4e123d54177a6 (patch)
tree9dc86aed057502820a5026fc7502e00864af42f8
parent36e4d985f0e015b189351d612132d382da9d014d (diff)
downloadvim-git-f1e0544d413b8b2ea129db0655b4e123d54177a6.tar.gz
patch 8.1.1893: script to summarize test results can be improvedv8.1.1893
Problem: Script to summarize test results can be improved. Solution: Use "silent" for substitute to avoid reporting number of matches. Remove duplicate "set nocp". (Daniel Hahler, closes #4845)
-rw-r--r--src/testdir/summarize.vim16
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 8 deletions
diff --git a/src/testdir/summarize.vim b/src/testdir/summarize.vim
index 69445677d..4a88935a4 100644
--- a/src/testdir/summarize.vim
+++ b/src/testdir/summarize.vim
@@ -1,7 +1,6 @@
-set nocp
if 1
- " This is executed with the eval feature
- set nocp
+ " This is executed only with the eval feature
+ set nocompatible
func Count(match, type)
if a:type ==# 'executed'
let g:executed += (a:match+0)
@@ -22,10 +21,11 @@ if 1
try
" This uses the :s command to just fetch and process the output of the
- " tests, it doesn't acutally replay anything
- %s/^Executed\s\+\zs\d\+\ze\s\+tests/\=Count(submatch(0),'executed')/egn
- %s/^SKIPPED \zs.*/\=Count(submatch(0), 'skipped')/egn
- %s/^\(\d\+\)\s\+FAILED:/\=Count(submatch(1), 'failed')/egn
+ " tests, it doesn't acutally replace anything.
+ " And it uses "silent" to avoid reporting the number of matches.
+ silent %s/^Executed\s\+\zs\d\+\ze\s\+tests/\=Count(submatch(0),'executed')/egn
+ silent %s/^SKIPPED \zs.*/\=Count(submatch(0), 'skipped')/egn
+ silent %s/^\(\d\+\)\s\+FAILED:/\=Count(submatch(1), 'failed')/egn
call extend(output, ["Skipped:"])
call extend(output, skipped_output)
@@ -37,7 +37,7 @@ if 1
\ printf(" Skipped: %5d Tests", g:skipped),
\ printf(" %s: %5d Tests", g:failed == 0 ? 'Failed' : 'FAILED', g:failed),
\ "",
- \ ])
+ \ ])
if filereadable('test.log')
" outputs and indents the failed test result
call extend(output, ["", "Failures: "])
diff --git a/src/version.c b/src/version.c
index 5d802fd57..b7ceb36b4 100644
--- 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 */
/**/
+ 1893,
+/**/
1892,
/**/
1891,