Mercurial > vim
changeset 11081:bbdb4f0134cb v8.0.0429
patch 8.0.0429: options test does not always test everything
commit https://github.com/vim/vim/commit/e8512d7fedbddd8d464b2c589e6ba5ab9a41bc78
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 7 22:33:32 2017 +0100
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 07 Mar 2017 22:45:04 +0100 |
| parents | 4348ed867eb1 |
| children | 1f96fcc44bdc |
| files | src/testdir/Make_all.mak src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/testdir/Makefile src/testdir/gen_opt_test.vim src/testdir/test_options.vim src/version.c |
| diffstat | 7 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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