thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1055

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2016-01-06 21:23:56 +01:00
parent 2795e21eaa
commit e7893a4088
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile
View File

@@ -1962,6 +1962,7 @@ test1 \
test_tagcase \ test_tagcase \
test_textobjects \ test_textobjects \
test_utf8 \ test_utf8 \
test_wordcount \
test_writefile \ test_writefile \
test2 test3 test4 test5 test6 test7 test8 test9 \ test2 test3 test4 test5 test6 test7 test8 test9 \
test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 \ 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) cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
test_assert \ test_assert \
test_backspace_opt \
test_cdo \ test_cdo \
test_menu \
test_quickfix \
test_searchpos \ test_searchpos \
test_set \ test_set \
test_sort \ test_sort \
test_undolevels \ test_undolevels \
test_unlet \
test_viml \ test_viml \
test_alot: test_alot:
cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile $@.res VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) 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 cat testdir/messages
newtests: 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 \ @if test -f testdir/test.log; then \
cat testdir/test.log; \ cat testdir/test.log; \
fi fi

6
src/testdir/Makefile
View File

@@ -120,7 +120,11 @@ nolog:
# Limitation: Only works with the +eval feature. # Limitation: Only works with the +eval feature.
RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f -u unix.vim -U NONE --noplugin 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: .vim.res:
$(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1055,
/**/ /**/
1054, 1054,
/**/ /**/