Permalink
Browse files

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.
  • Loading branch information...
brammool committed Mar 7, 2017
1 parent 65408f7 commit e8512d7fedbddd8d464b2c589e6ba5ab9a41bc78
View
@@ -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
View
@@ -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
@@ -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
View
@@ -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
@@ -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
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 429,
/**/
428,
/**/

0 comments on commit e8512d7

Please sign in to comment.