mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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>
This commit is contained in:
parent
5e48e97e42
commit
b498c44444
@ -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 $<
|
$(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
|
||||||
@$(DEL) vimcmd
|
@$(DEL) vimcmd
|
||||||
|
|
||||||
opt_test.vim: ../optiondefs.h gen_opt_test.vim
|
opt_test.vim: gen_opt_test.vim ../optiondefs.h
|
||||||
$(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S 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
|
test_bench_regexp.res: test_bench_regexp.vim
|
||||||
-$(DEL) benchmark.out
|
-$(DEL) benchmark.out
|
||||||
|
@ -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
|
$(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $*.vim
|
||||||
@del vimcmd
|
@del vimcmd
|
||||||
|
|
||||||
opt_test.vim: ../optiondefs.h gen_opt_test.vim
|
opt_test.vim: gen_opt_test.vim ../optiondefs.h
|
||||||
$(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S 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
|
test_bench_regexp.res: test_bench_regexp.vim
|
||||||
-if exist benchmark.out del benchmark.out
|
-if exist benchmark.out del benchmark.out
|
||||||
|
@ -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 $<
|
$(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
|
||||||
@rm vimcmd
|
@rm vimcmd
|
||||||
|
|
||||||
opt_test.vim: ../optiondefs.h gen_opt_test.vim
|
GEN_OPT_DEPS = gen_opt_test.vim ../optiondefs.h
|
||||||
$(VIMPROG) -e -s -u NONE $(NO_INITS) --nofork --gui-dialog-file guidialog -S 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:
|
test_xxd.res:
|
||||||
XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim
|
XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim
|
||||||
|
@ -192,6 +192,12 @@ let test_values = {
|
|||||||
\ 'otherstring': [['', 'xxx'], []],
|
\ '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
|
1
|
||||||
/struct vimoption options
|
/struct vimoption options
|
||||||
while 1
|
while 1
|
||||||
@ -253,11 +259,14 @@ call add(script, 'let &lines = save_lines')
|
|||||||
|
|
||||||
call writefile(script, 'opt_test.vim')
|
call writefile(script, 'opt_test.vim')
|
||||||
|
|
||||||
" Exit with error-code if error occurs.
|
" Write error messages if error occurs.
|
||||||
catch
|
catch
|
||||||
set verbose=1
|
" Append errors to test.log
|
||||||
echoc 'Error:' v:exception 'in' v:throwpoint
|
let error = $'Error: {v:exception} in {v:throwpoint}'
|
||||||
cq! 1
|
echoc error
|
||||||
|
split test.log
|
||||||
|
call append('$', error)
|
||||||
|
write
|
||||||
endtry
|
endtry
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -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 */
|
||||||
|
/**/
|
||||||
|
791,
|
||||||
/**/
|
/**/
|
||||||
790,
|
790,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user