Skip to content

Commit e7893a4

Browse files
committed
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.
1 parent 2795e21 commit e7893a4

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1962,6 +1962,7 @@ test1 \
19621962
test_tagcase \
19631963
test_textobjects \
19641964
test_utf8 \
1965+
test_wordcount \
19651966
test_writefile \
19661967
test2 test3 test4 test5 test6 test7 test8 test9 \
19671968
test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 \
@@ -1977,11 +1978,15 @@ test1 \
19771978
cd testdir; rm -f [email protected]; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
19781979

19791980
test_assert \
1981+
test_backspace_opt \
19801982
test_cdo \
1983+
test_menu \
1984+
test_quickfix \
19811985
test_searchpos \
19821986
test_set \
19831987
test_sort \
19841988
test_undolevels \
1989+
test_unlet \
19851990
test_viml \
19861991
test_alot:
19871992
cd testdir; rm -f [email protected] test.log messages; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
@@ -1991,7 +1996,7 @@ test_assert \
19911996
cat testdir/messages
19921997

19931998
newtests:
1994-
cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile newtests VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
1999+
cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile newtestssilent VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
19952000
@if test -f testdir/test.log; then \
19962001
cat testdir/test.log; \
19972002
fi

src/testdir/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,11 @@ nolog:
120120
# Limitation: Only works with the +eval feature.
121121
RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f -u unix.vim -U NONE --noplugin
122122

123-
newtests: $(NEW_TESTS)
123+
newtests: newtestssilent
124+
@/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then cat messages && cat test.log; fi"
125+
126+
newtestssilent: $(NEW_TESTS)
127+
124128

125129
.vim.res:
126130
$(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1055,
744746
/**/
745747
1054,
746748
/**/

0 commit comments

Comments
 (0)