thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source 
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>
This commit is contained in:
Christian Brabandt
2024-02-10 13:02:17 +01:00
parent 45932c5c4a
commit 627c950e5b
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/syntax/Makefile
View File

@@ -11,6 +11,8 @@ VIMRUNTIME = ../..
# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=45 --log-file=valgrind.$* # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=45 --log-file=valgrind.$*
# ENVVARS = LC_ALL=C LANG=C LANGUAGE=C # 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) RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) ../$(VIMPROG) -f $(GUI_FLAG)
@@ -25,11 +27,11 @@ test:
@# the "vimcmd" file is used by the screendump utils @# the "vimcmd" file is used by the screendump utils
@echo "../$(VIMPROG)" > testdir/vimcmd @echo "../$(VIMPROG)" > testdir/vimcmd
@echo "$(RUN_VIMTEST)" >> 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 @# 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 tail -n 6 testdir/messages; fi
@if [ -f testdir/messages ]; then cat testdir/messages; fi @if [ -f testdir/messages ]; then cat testdir/messages; fi
clean testclean: clean testclean:
rm -f testdir/failed/* testdir/done/* testdir/vimcmd testdir/messages rm -f testdir/failed/* testdir/done/* testdir/vimcmd testdir/messages testdir/Xtestscript

7
runtime/syntax/testdir/runtest.vim
View File

@@ -237,11 +237,12 @@ call Message('FAILED: ' .. len(failed_tests) .. ': ' .. string(failed_tests))
call Message('skipped: ' .. skipped_count) call Message('skipped: ' .. skipped_count)
call AppendMessages('== SUMMARY ==') call AppendMessages('== SUMMARY ==')
" Matching "if 1" at the start.
endif
if len(failed_tests) > 0 if len(failed_tests) > 0
" have make report an error " have make report an error
cquit cquit
endif endif
" Matching "if 1" at the start.
endif
qall! qall!

3
src/testdir/shared.vim
View File

@@ -300,7 +300,8 @@ func GetVimCommand(...)
endif endif
let cmd .= ' --not-a-term' let cmd .= ' --not-a-term'
let cmd .= ' --gui-dialog-file guidialogfile' 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 using valgrind, make sure every run uses a different log file.
if cmd =~ 'valgrind.*--log-file=' if cmd =~ 'valgrind.*--log-file='

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
91,
/**/ /**/
90, 90,
/**/ /**/