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 6a86d3e..ebd8dd1 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -112,7 +112,10 @@
# 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 57bcb3a..15a28cc 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -121,7 +121,7 @@
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 4631f24..0e20abf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 413,
+/**/
412,
/**/
411,