patch 9.1.0091: Syntax test fails when run with non C locale

Problem:  Syntax test fails when run with non C locale
Solution: Run syntax tests with C locale, clean up Xtestscript file,
          strip environment variables from GetVimCommand()
          (h-east)

closes: #14007

Co-authored-by: h-east <h.east.727@gmail.com>
Signed-off-by: h-east <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/syntax/Makefile b/runtime/syntax/Makefile
index f3b578ce9b23fcc3466e0073c0bd6a84a4faa665..945308fd7c4b14c3f60e0074116c9e05bb2b97a2 100644 (file)
--- a/runtime/syntax/Makefile
+++ b/runtime/syntax/Makefile
@@ -11,6 +11,8 @@ VIMRUNTIME = ../..
 # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=45 --log-file=valgrind.$*
 
 # ENVVARS = LC_ALL=C LANG=C LANGUAGE=C
+# Run the syntax tests with a C locale
+ENVVARS = LC_ALL=C
 
 RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) ../$(VIMPROG) -f $(GUI_FLAG)
 
@@ -25,11 +27,11 @@ test:
        @# the "vimcmd" file is used by the screendump utils
        @echo "../$(VIMPROG)" > testdir/vimcmd
        @echo "$(RUN_VIMTEST)" >> testdir/vimcmd
-       VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term $(DEBUGLOG) -u testdir/runtest.vim
+       VIMRUNTIME=$(VIMRUNTIME) $(ENVVARS) $(VIMPROG) --clean --not-a-term $(DEBUGLOG) -u testdir/runtest.vim
        @# FIXME: Temporarily show the whole file to find out what goes wrong
        @#if [ -f testdir/messages ]; then tail -n 6 testdir/messages; fi
        @if [ -f testdir/messages ]; then cat testdir/messages; fi
 
 
 clean testclean:
-       rm -f testdir/failed/* testdir/done/* testdir/vimcmd testdir/messages
+       rm -f testdir/failed/* testdir/done/* testdir/vimcmd testdir/messages testdir/Xtestscript

diff --git a/runtime/syntax/testdir/runtest.vim b/runtime/syntax/testdir/runtest.vim
index 80f1eff58a9184378ec7f925860dc6c0956305a5..d2ce3d19fa17c465631518bb842d60348be405bb 100644 (file)
--- a/runtime/syntax/testdir/runtest.vim
+++ b/runtime/syntax/testdir/runtest.vim
@@ -237,11 +237,12 @@ 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
 endif
+
+" Matching "if 1" at the start.
+endif
+
 qall!

diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index 4d008a0bfc9f4d4ead94ed3a06d4ed37befe3cab..9479efbdc03b40672e375bc51fde9d66f999136b 100644 (file)
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -300,7 +300,8 @@ func GetVimCommand(...)
   endif
   let cmd .= ' --not-a-term'
   let cmd .= ' --gui-dialog-file guidialogfile'
-  let cmd = substitute(cmd, 'VIMRUNTIME=\S\+', '', '')
+  " remove any environment variables
+  let cmd = substitute(cmd, '[A-Z_]*=\S\+ *', '', 'g')
 
   " If using valgrind, make sure every run uses a different log file.
   if cmd =~ 'valgrind.*--log-file='

diff --git a/src/version.c b/src/version.c
index 6beeabbd0723216788c6b4b2604a3d61846a9a71..91abfe113d09ff5aed43667f123b8b851461e4b0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    91,
 /**/
     90,
 /**/