patch 8.0.0429: options test does not always test everything
Problem: Options test does not always test everything.
Solution: Fix dependency for opt_test.vim. Give a message when opt_test.vim
was not found.
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 17c6028..53fb829 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -221,4 +221,4 @@
test60.out: test60.vim
-test_options.res: opt_test.vim
+test_options.res test_alot.res: opt_test.vim
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 1a98ebb..406d56a 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -130,4 +130,4 @@
@del vimcmd
opt_test.vim: ../option.c gen_opt_test.vim
- $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term
+ $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 8235b95..b95a6ea 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -133,4 +133,4 @@
@$(DEL) vimcmd
opt_test.vim: ../option.c gen_opt_test.vim
- $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term
+ $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index e44bd5c..d464d67 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -142,5 +142,4 @@
@rm vimcmd
opt_test.vim: ../option.c gen_opt_test.vim
- $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term
-
+ $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 07a744b..1187dd5 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -13,7 +13,7 @@
\ 'let save_term = &term',
\ ]
-edit option.c
+edit
/#define p_term
let end = line('.')
@@ -197,7 +197,7 @@
call add(script, 'let &columns = save_columns')
call add(script, 'let &lines = save_lines')
-call writefile(script, 'testdir/opt_test.vim')
+call writefile(script, 'opt_test.vim')
endif
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index ac43c1a..9cf5e5f 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -301,8 +301,9 @@
endfunc
func Test_set_values()
- " The file is only generated when running "make test" in the src directory.
if filereadable('opt_test.vim')
source opt_test.vim
+ else
+ throw 'Skipped: opt_test.vim does not exist'
endif
endfunc
diff --git a/src/version.c b/src/version.c
index 983a425..e8779f5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 429,
+/**/
428,
/**/
427,