# HG changeset patch # User Christian Brabandt # Date 1537472705 -7200 # Node ID 9b04068f7265efc33443c048f695291ef7194f5f # Parent 433a8e0173a4d6eda707442eadc186483e26d102 patch 8.1.0413: test output is duplicated or missing commit https://github.com/vim/vim/commit/933bef779a4da4180f9212039363236ff68a33bc Author: Bram Moolenaar 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) diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak --- 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 --- 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 --- 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,