Mercurial > vim
changeset 34314:1df8f78d27b1 v9.1.0091
patch 9.1.0091: Syntax test fails when run with non C locale
Commit: https://github.com/vim/vim/commit/627c950e5b30503a084bd0092f9cb2a5fe73fe87
Author: Christian Brabandt <cb@256bit.org>
Date: Sat Feb 10 13:02:17 2024 +0100
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 10 Feb 2024 13:15:06 +0100 |
| parents | faf0d254063e |
| children | 8bd48fdd3413 |
| files | runtime/syntax/Makefile runtime/syntax/testdir/runtest.vim src/testdir/shared.vim src/version.c |
| diffstat | 4 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/runtime/syntax/testdir/runtest.vim +++ b/runtime/syntax/testdir/runtest.vim @@ -237,11 +237,12 @@ call Message('FAILED: ' .. len(failed_te 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!
--- 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='