Mercurial > vim
changeset 36250:0054f7452614 draft v9.1.0760
patch 9.1.0760: tests: no error reported, if gen_opt_test.vim fails
Commit: https://github.com/vim/vim/commit/d4ad4c9b3e9f9fd8ba1a7d0d61ec5839df645635
Author: Milly <milly.ca@gmail.com>
Date: Sun Oct 6 16:27:28 2024 +0200
patch 9.1.0760: tests: no error reported, if gen_opt_test.vim fails
Problem: tests: no error reported, if gen_opt_test.vim fails
Solution: Make Vim exit with return code 1 in case of any error
(Milly)
closes: #15795
Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 06 Oct 2024 16:30:11 +0200 |
| parents | 9ac306867c6d |
| children | 8a84155aa86e |
| 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, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -158,7 +158,7 @@ test_gui_init.res: test_gui_init.vim @$(DEL) vimcmd opt_test.vim: ../optiondefs.h gen_opt_test.vim - $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h + $(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S gen_opt_test.vim ../optiondefs.h test_bench_regexp.res: test_bench_regexp.vim -$(DEL) benchmark.out
--- a/src/testdir/Make_mvc.mak +++ b/src/testdir/Make_mvc.mak @@ -152,7 +152,7 @@ test_gui_init.res: test_gui_init.vim @del vimcmd opt_test.vim: ../optiondefs.h gen_opt_test.vim - $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h + $(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S gen_opt_test.vim ../optiondefs.h test_bench_regexp.res: test_bench_regexp.vim -if exist benchmark.out del benchmark.out
--- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -161,7 +161,7 @@ test_gui_init.res: test_gui_init.vim @rm vimcmd opt_test.vim: ../optiondefs.h gen_opt_test.vim - $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h + $(VIMPROG) -e -s -u NONE $(NO_INITS) --nofork --gui-dialog-file guidialog -S gen_opt_test.vim ../optiondefs.h 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 @@ -1,10 +1,12 @@ -" Script to generate testdir/opt_test.vim from option.c +" Script to generate testdir/opt_test.vim from optiondefs.h set cpo=&vim " Only do this when build with the +eval feature. if 1 +try + set nomore const K_KENTER = -16715 @@ -244,6 +246,13 @@ call add(script, 'let &lines = save_line call writefile(script, 'opt_test.vim') +" Exit with error-code if error occurs. +catch + set verbose=1 + echoc 'Error:' v:exception 'in' v:throwpoint + cq! 1 +endtry + endif qa!