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...@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...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index f26950e2e..16632b350 100644
--- 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
diff --git a/src/testdir/Make_mvc.mak b/src/testdir/Make_mvc.mak
index bb38e25c5..bbfd8f09e 100644
--- 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
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 2827f994a..66b8f1b74 100644
--- 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
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 4ca3c0938..372070b7a 100644
--- 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_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
diff --git a/src/version.c b/src/version.c
index 89ca65c51..c5d66b141 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 791,
/**/
790,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1t1Vxg-006KBX-LN%40256bit.org.
