Mercurial > vim
changeset 33328:1f781dcb7a73 v9.0.1929
patch 9.0.1929: runtime tests fail with tiny vim
Commit: https://github.com/vim/vim/commit/99c3849a9299982666a7b677f0565a7b3717d20c
Author: Dominique Pell? <dominique.pelle@tomtom.com>
Date: Sun Sep 24 16:09:31 2023 +0200
patch 9.0.1929: runtime tests fail with tiny vim
Problem: runtime tests fail with tiny vim
Solution: check for tiny vim, run runtime tests in CI
even for tiny version
closes: #13169
closes: #13170
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Dominique Pell? <dominique.pelle@tomtom.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 24 Sep 2023 16:15:04 +0200 |
| parents | 482d9904d479 |
| children | f5864ff35688 |
| files | Makefile runtime/syntax/Makefile runtime/syntax/testdir/runtest.vim src/version.c |
| diffstat | 4 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ all install uninstall tools config confi @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
--- 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:
--- 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