diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | runtime/syntax/Makefile | 4 | ||||
| -rw-r--r-- | runtime/syntax/testdir/runtest.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 6 deletions
@@ -40,7 +40,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ @echo "If there are problems, cd to the src directory and run make there" cd src && $(MAKE) $@ @# When the target is "test" also run the indent and syntax tests. - @if test "$@" = "test"; then \ + @if test "$@" = "test" -o "$@" = "testtiny"; then \ $(MAKE) indenttest; \ $(MAKE) syntaxtest; \ fi diff --git a/runtime/syntax/Makefile b/runtime/syntax/Makefile index c8a7f00232..f3b578ce9b 100644 --- a/runtime/syntax/Makefile +++ b/runtime/syntax/Makefile @@ -27,8 +27,8 @@ test: @echo "$(RUN_VIMTEST)" >> testdir/vimcmd VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term $(DEBUGLOG) -u testdir/runtest.vim @# FIXME: Temporarily show the whole file to find out what goes wrong - @#tail -n 6 testdir/messages - @cat testdir/messages + @#if [ -f testdir/messages ]; then tail -n 6 testdir/messages; fi + @if [ -f testdir/messages ]; then cat testdir/messages; fi clean testclean: diff --git a/runtime/syntax/testdir/runtest.vim b/runtime/syntax/testdir/runtest.vim index 2603a52da0..80f1eff58a 100644 --- a/runtime/syntax/testdir/runtest.vim +++ b/runtime/syntax/testdir/runtest.vim @@ -231,15 +231,15 @@ for fname in glob('input/*.*', 1, 1) endif endfor -" Matching "if 1" at the start. -endif - call Message(s:test_run_message) call Message('OK: ' .. ok_count) call Message('FAILED: ' .. len(failed_tests) .. ': ' .. string(failed_tests)) call Message('skipped: ' .. skipped_count) call AppendMessages('== SUMMARY ==') +" Matching "if 1" at the start. +endif + if len(failed_tests) > 0 " have make report an error cquit diff --git a/src/version.c b/src/version.c index 574dedfbcf..c258d7b4e7 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1929, +/**/ 1928, /**/ 1927, |