Mercurial > vim
changeset 36336:b08e9b73ad38 draft v9.1.0791
patch 9.1.0791: tests: errors in gen_opt_test.vim are not shown
Commit: https://github.com/vim/vim/commit/b498c444440b9da0e7abec430d446a31e01d5eb9
Author: Milly <milly.ca@gmail.com>
Date: Thu Oct 17 21:05:31 2024 +0200
patch 9.1.0791: tests: errors in gen_opt_test.vim are not shown
Problem: tests: errors in gen_opt_test.vim are not shown
Solution: update gen_opt_test.vim and write test.log,
let the makefile output test.log (Milly)
closes: #15887
Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 17 Oct 2024 21:15:04 +0200 |
parents | c48a10c57e17 |
children | 135f62f9d861 |
files | src/testdir/Make_ming.mak src/testdir/Make_mvc.mak src/testdir/Makefile src/testdir/gen_opt_test.vim src/version.c |
diffstat | 5 files changed, 32 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -157,8 +157,12 @@ test_gui_init.res: test_gui_init.vim $(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @$(DEL) vimcmd -opt_test.vim: ../optiondefs.h gen_opt_test.vim - $(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S gen_opt_test.vim ../optiondefs.h +opt_test.vim: gen_opt_test.vim ../optiondefs.h + $(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S $^ + @if test -f test.log; then \ + cat test.log; \ + exit 1; \ + fi test_bench_regexp.res: test_bench_regexp.vim -$(DEL) benchmark.out
--- a/src/testdir/Make_mvc.mak +++ b/src/testdir/Make_mvc.mak @@ -151,8 +151,9 @@ test_gui_init.res: test_gui_init.vim $(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $*.vim @del vimcmd -opt_test.vim: ../optiondefs.h gen_opt_test.vim - $(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S gen_opt_test.vim ../optiondefs.h +opt_test.vim: gen_opt_test.vim ../optiondefs.h + $(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S $** + @if exist test.log ( type test.log & exit /b 1 ) test_bench_regexp.res: test_bench_regexp.vim -if exist benchmark.out del benchmark.out
--- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -160,8 +160,14 @@ test_gui_init.res: test_gui_init.vim $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @rm vimcmd -opt_test.vim: ../optiondefs.h gen_opt_test.vim - $(VIMPROG) -e -s -u NONE $(NO_INITS) --nofork --gui-dialog-file guidialog -S gen_opt_test.vim ../optiondefs.h +GEN_OPT_DEPS = gen_opt_test.vim ../optiondefs.h + +opt_test.vim: $(GEN_OPT_DEPS) + $(VIMPROG) -e -s -u NONE $(NO_INITS) --nofork --gui-dialog-file guidialog -S $(GEN_OPT_DEPS) + @if test -f test.log; then \ + cat test.log; \ + exit 1; \ + fi test_xxd.res: XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim
--- a/src/testdir/gen_opt_test.vim +++ b/src/testdir/gen_opt_test.vim @@ -192,6 +192,12 @@ let test_values = { \ 'otherstring': [['', 'xxx'], []], \} +const invalid_options = test_values->keys() + \->filter({-> v:val !~# '^other' && !exists($"&{v:val}")}) +if !empty(invalid_options) + throw $"Invalid option name in test_values: '{invalid_options->join("', '")}'" +endif + 1 /struct vimoption options while 1 @@ -253,11 +259,14 @@ call add(script, 'let &lines = save_line call writefile(script, 'opt_test.vim') -" Exit with error-code if error occurs. +" Write error messages if error occurs. catch - set verbose=1 - echoc 'Error:' v:exception 'in' v:throwpoint - cq! 1 + " Append errors to test.log + let error = $'Error: {v:exception} in {v:throwpoint}' + echoc error + split test.log + call append('$', error) + write endtry endif