aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00
Code

patch 9.1.0791: tests: errors in gen_opt_test.vim are not shown

Browse Source 
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>
This commit is contained in:
Milly 2024-10-17 21:05:31 +02:00 committed by Christian Brabandt
parent 5e48e97e42
commit b498c44444
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
5 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/Make_ming.mak
View File

@ -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

5
src/testdir/Make_mvc.mak
View File

@ -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

10
src/testdir/Makefile
View File

@ -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

17
src/testdir/gen_opt_test.vim
View File

@ -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_lines')
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

2
src/version.c
View File

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