patch 8.1.1893: script to summarize test results can be improved

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)

diff --git a/src/testdir/summarize.vim b/src/testdir/summarize.vim
index 69445677d55ef90b38f9d1900298e70f37642e97..4a88935a40aac97cd8ae625df13b772d796bbfe3 100644 (file)
--- 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 5d802fd57a2189ce42ffa2cd9b28cd8f6986b59f..b7ceb36b435727fbaf9f1769fa0c8edbd327d9d7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1893,
 /**/
     1892,
 /**/