diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-02-10 13:02:17 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-10 13:02:17 +0100 |
| commit | 627c950e5b30503a084bd0092f9cb2a5fe73fe87 (patch) | |
| tree | 41cdcd8d8790cf3192496528ce78d894701d6a42 /runtime/syntax | |
| parent | 45932c5c4a9ec01f7c2aa09b1574430853dafb4b (diff) | |
patch 9.1.0091: Syntax test fails when run with non C localev9.1.0091
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>
Diffstat (limited to 'runtime/syntax')
| -rw-r--r-- | runtime/syntax/Makefile | 6 | ||||
| -rw-r--r-- | runtime/syntax/testdir/runtest.vim | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/runtime/syntax/Makefile b/runtime/syntax/Makefile index f3b578ce9b..945308fd7c 100644 --- 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 80f1eff58a..d2ce3d19fa 100644 --- 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! |