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 17c60281f60f9c79e039a4e5318602a57a2056ea..53fb8292820d9a635ed2f2555a83260d67f506e5 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -221,4 +221,4 @@ test49.out: test49.vim
 
 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 1a98ebb5418f8d440daca6edc0b87fbb379de4f6..406d56afedeffbeb7e4c04b6f3d29aef2c186b79 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -130,4 +130,4 @@ test_gui_init.res: test_gui_init.vim
        @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 8235b959a7427cb956d09510c4ae70bf2b9bb075..b95a6eaa78f2fde20fcfcbe5e85cf4ef3badddeb 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -133,4 +133,4 @@ test_gui_init.res: test_gui_init.vim
        @$(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 e44bd5c7ba6f72e63598684e589f2daecd34ac97..d464d67aa6a2ea17c63423cc1ea76bac6041575c 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -142,5 +142,4 @@ test_gui_init.res: test_gui_init.vim
        @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 07a744bc0da5a020f34a0a84e99f9521e6699019..1187dd5963f813118da8f8fe01622369ab237128 100644 (file)
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -13,7 +13,7 @@ let script = [
       \ 'let save_term = &term',
       \ ]
 
-edit option.c
+edit
 /#define p_term
 let end = line('.')
 
@@ -197,7 +197,7 @@ call add(script, 'let &term = save_term')
 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 ac43c1a81d0ecc8caee71afa2d7a4b3edb9adc57..9cf5e5f1142b5a7fb0f51a2cb10bf261d7bd053b 100644 (file)
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -301,8 +301,9 @@ func Test_set_all()
 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 983a4259ea68fd746dbce9e434d8e57fc05d0410..e8779f5292d4aa39b3435d213eb13d86da7f0558 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    429,
 /**/
     428,
 /**/