Skip to content

Commit e8512d7

Browse files
committed
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.
1 parent 65408f7 commit e8512d7

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

src/testdir/Make_all.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,4 @@ test49.out: test49.vim
221221

222222
test60.out: test60.vim
223223

224-
test_options.res: opt_test.vim
224+
test_options.res test_alot.res: opt_test.vim

src/testdir/Make_dos.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,4 @@ test_gui_init.res: test_gui_init.vim
130130
@del vimcmd
131131

132132
opt_test.vim: ../option.c gen_opt_test.vim
133-
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term
133+
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c

src/testdir/Make_ming.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ test_gui_init.res: test_gui_init.vim
133133
@$(DEL) vimcmd
134134

135135
opt_test.vim: ../option.c gen_opt_test.vim
136-
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term
136+
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c

src/testdir/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,4 @@ test_gui_init.res: test_gui_init.vim
142142
@rm vimcmd
143143

144144
opt_test.vim: ../option.c gen_opt_test.vim
145-
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term
146-
145+
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c

src/testdir/gen_opt_test.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let script = [
1313
\ 'let save_term = &term',
1414
\ ]
1515

16-
edit option.c
16+
edit
1717
/#define p_term
1818
let end = line('.')
1919

@@ -197,7 +197,7 @@ call add(script, 'let &term = save_term')
197197
call add(script, 'let &columns = save_columns')
198198
call add(script, 'let &lines = save_lines')
199199

200-
call writefile(script, 'testdir/opt_test.vim')
200+
call writefile(script, 'opt_test.vim')
201201

202202
endif
203203

src/testdir/test_options.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,9 @@ func Test_set_all()
301301
endfunc
302302

303303
func Test_set_values()
304-
" The file is only generated when running "make test" in the src directory.
305304
if filereadable('opt_test.vim')
306305
source opt_test.vim
306+
else
307+
throw 'Skipped: opt_test.vim does not exist'
307308
endif
308309
endfunc

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
429,
767769
/**/
768770
428,
769771
/**/

0 commit comments

Comments
 (0)