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>

diff --git a/Makefile b/Makefile
index 24481054158c4da0cde6034fa20427252130bde8..e9e43c1d7e543bb83d77adf24f6eb0a6d6d306f0 100644 (file)
--- 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 c8a7f002325ada8e0baa6969e3444ac62411d24a..f3b578ce9b23fcc3466e0073c0bd6a84a4faa665 100644 (file)
--- 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 2603a52da074b92e4b05fa7449a8dc5d458940fb..80f1eff58a9184378ec7f925860dc6c0956305a5 100644 (file)
--- 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 574dedfbcf40132336b9a3762d9ac25d1594321a..c258d7b4e7bdca84370a782534eea81d13e182cb 100644 (file)
--- 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,
 /**/