diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-06 21:23:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-06 21:23:56 +0100 |
| commit | e7893a4088d6ea796bcab6195d232cb26c12c317 (patch) | |
| tree | c9ab84fbe167acee65f79b4d172aa2e26223ef2f | |
| parent | 2795e21eaafaeaf95a91667fd411023280d0f902 (diff) | |
| download | vim-git-e7893a4088d6ea796bcab6195d232cb26c12c317.tar.gz | |
patch 7.4.1055v7.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.
| -rw-r--r-- | src/Makefile | 7 | ||||
| -rw-r--r-- | src/testdir/Makefile | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 500287f84..f6b760f44 100644 --- 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 6cc928c7f..8f321b585 100644 --- 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 23f9ed016..7733f7987 100644 --- 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, |