changeset 14802:9b04068f7265 v8.1.0413

patch 8.1.0413: test output is duplicated or missing commit https://github.com/vim/vim/commit/933bef779a4da4180f9212039363236ff68a33bc Author: Bram Moolenaar <Bram@vim.org> Date: Thu Sep 20 21:39:33 2018 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Thu, 20 Sep 2018 21:45:05 +0200
parents 433a8e0173a4
children 2739f3b643cc
files src/testdir/Make_dos.mak src/testdir/Makefile src/version.c
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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)
 
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    413,
+/**/
     412,
 /**/
     411,