From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 20 Sep 2018 19:39:33 +0000 (+0200)
Subject: patch 8.1.0413: test output is duplicated or missing
X-Git-Tag: v8.1.0413
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=933bef779a4da4180f9212039363236ff68a33bc;p=thirdparty%2Fvim.git

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 6a86d3efd3..ebd8dd1c3b 100644
--- 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 57bcb3aa6a..15a28ccd0c 100644
--- 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 4631f243dd..0e20abf55a 100644
--- 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,
 /**/