patch 8.1.0413: test output is duplicated or missing

Problem:    Test output is duplicated or missing.
Solution:   Adjust the MS-Windows and Unix test makefiles. (Ken Takata,
            closes #3452)

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 6a86d3efd3659ce995448c6869e1bdf717f680f5..ebd8dd1c3ba1866be9491878b8c95b5acd775d07 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -112,7 +112,10 @@ bench_re_freeze.out: bench_re_freeze.vim
 # to write and a lot easier to read and debug.
 # Limitation: Only works with the +eval feature.
 
-newtests: $(NEW_TESTS)
+newtests: newtestssilent
+       @if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages
+
+newtestssilent: $(NEW_TESTS)
 
 .vim.res:
        @echo $(VIMPROG) > vimcmd

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 57bcb3aa6aa308c51e55d5f4958de8badb78b717..15a28ccd0c5305b69ad96d5b3f9dfd9c8c7f5339 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -121,7 +121,7 @@ nolog:
 RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim
 
 newtests: newtestssilent
-       @/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages && if test -f test.log; then cat test.log; fi ; fi"
+       @/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages; fi"
 
 newtestssilent: $(NEW_TESTS)
 

diff --git a/src/version.c b/src/version.c
index 4631f243ddb824aeeb8a1c2998bfb54a094a9532..0e20abf55a55d5bbc60d46a327e18230c9f4a27f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    413,
 /**/
     412,
 /**/