patch 9.0.1929: runtime tests fail with tiny vim
Commit:
https://github.com/vim/vim/commit/99c3849a9299982666a7b677f0565a7b3717d20c
Author: Dominique Pellé <dominique.pe...@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 <c...@256bit.org>
Co-authored-by: Dominique Pellé <dominique.pe...@tomtom.com>
diff --git a/Makefile b/Makefile
index 244810541..e9e43c1d7 100644
--- a/Makefile
+++ b/Makefile
@@ -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 c8a7f0023..f3b578ce9 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 2603a52da..80f1eff58 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 574dedfbc..c258d7b4e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1929,
/**/
1928,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qkPt2-009XlE-5x%40256bit.org.
