# HG changeset patch # User Christian Brabandt # Date 1452112205 -3600 # Node ID cfc0d60f6233f0b0220a12fa79145f6a82da576a # Parent d71bf27530738cdf632b8402d454d5fc9190157e commit https://github.com/vim/vim/commit/e7893a4088d6ea796bcab6195d232cb26c12c317 Author: Bram Moolenaar Date: Wed Jan 6 21:23:56 2016 +0100 patch 7.4.1055 Problem: Running "make newtests" in src/testdir has no output. Solution: List the messages file when a test fails. (Christian Brabandt) Update the list of tests. diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -1962,6 +1962,7 @@ test1 \ test_tagcase \ test_textobjects \ test_utf8 \ + test_wordcount \ test_writefile \ test2 test3 test4 test5 test6 test7 test8 test9 \ test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 \ @@ -1977,11 +1978,15 @@ test1 \ cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) test_assert \ + test_backspace_opt \ test_cdo \ + test_menu \ + test_quickfix \ test_searchpos \ test_set \ test_sort \ test_undolevels \ + test_unlet \ test_viml \ test_alot: cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile $@.res VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) @@ -1991,7 +1996,7 @@ test_assert \ cat testdir/messages newtests: - cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile newtests VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) + cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile newtestssilent VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) @if test -f testdir/test.log; then \ cat testdir/test.log; \ fi diff --git a/src/testdir/Makefile b/src/testdir/Makefile --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -120,7 +120,11 @@ nolog: # Limitation: Only works with the +eval feature. RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f -u unix.vim -U NONE --noplugin -newtests: $(NEW_TESTS) +newtests: newtestssilent + @/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then cat messages && cat test.log; fi" + +newtestssilent: $(NEW_TESTS) + .vim.res: $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1055, +/**/ 1054, /**/ 1053,