From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 7 Mar 2017 21:33:32 +0000 (+0100)
Subject: patch 8.0.0429: options test does not always test everything
X-Git-Tag: v8.0.0429
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8512d7fedbddd8d464b2c589e6ba5ab9a41bc78;p=vim

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 17c60281f..53fb82928 100644
--- 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 1a98ebb54..406d56afe 100644
--- 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 8235b959a..b95a6eaa7 100644
--- 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 e44bd5c7b..d464d67aa 100644
--- 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 07a744bc0..1187dd596 100644
--- 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 ac43c1a81..9cf5e5f11 100644
--- 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 983a4259e..e8779f529 100644
--- 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,
 /**/