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
index 500287f8474b8eb1b4ba08efae7bb5be84f0d39f..f6b760f44b29e49aebb69d1d1d712a43dfd9e7b6 100644 (file)
--- 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
index 6cc928c7f6b762d8695bef45bc67c24a15d8fb54..8f321b58522f38889f8914f55e0f69b764dc8cd8 100644 (file)
--- 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
index 23f9ed01687affe091fcaf4e78d7883109a16ced..7733f7987ba882d3c8bef50bf55bbaa837ea0bde 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1055,
 /**/
     1054,
 /**/