diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-20 21:39:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-20 21:39:33 +0200 |
| commit | 933bef779a4da4180f9212039363236ff68a33bc (patch) | |
| tree | 0c6d0b87e323892c1ff13f1768181fd8499260eb | |
| parent | 92cbf62b872c2cfccb2fe4f9c46881c69d488c8a (diff) | |
| download | vim-git-933bef779a4da4180f9212039363236ff68a33bc.tar.gz | |
patch 8.1.0413: test output is duplicated or missingv8.1.0413
Problem: Test output is duplicated or missing.
Solution: Adjust the MS-Windows and Unix test makefiles. (Ken Takata,
closes #3452)
| -rw-r--r-- | src/testdir/Make_dos.mak | 5 | ||||
| -rw-r--r-- | src/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 6a86d3efd..ebd8dd1c3 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 57bcb3aa6..15a28ccd0 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 4631f243d..0e20abf55 100644 --- 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, |