thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.2028: options test script does not work

Browse Source 
Problem:    Options test script does not work.
Solution:   Use optiondefs.h for input.
This commit is contained in:
Bram Moolenaar
2019-09-14 15:46:32 +02:00
parent 57da698168
commit d9b0d83b13
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/Make_dos.mak
View File

@@ -134,5 +134,5 @@ test_gui_init.res: test_gui_init.vim
test_options.res test_alot.res: opt_test.vim test_options.res test_alot.res: opt_test.vim
opt_test.vim: ../option.c gen_opt_test.vim opt_test.vim: ../optiondefs.h gen_opt_test.vim
$(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h

4
src/testdir/Make_ming.mak
View File

@@ -138,5 +138,5 @@ test_gui_init.res: test_gui_init.vim
test_options.res test_alot.res: opt_test.vim test_options.res test_alot.res: opt_test.vim
opt_test.vim: ../option.c gen_opt_test.vim opt_test.vim: ../optiondefs.h gen_opt_test.vim
$(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h

6
src/testdir/Makefile
View File

@@ -83,6 +83,8 @@ RM_ON_RUN = test.out X* viminfo
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out
RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
# Delete files that may interfere with running tests. This includes some files
# that may result from working on the tests, not only from running them.
clean: clean:
-rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind -rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind
-rm -f opt_test.vim test.log test_result.log messages -rm -f opt_test.vim test.log test_result.log messages
@@ -176,8 +178,8 @@ test_gui_init.res: test_gui_init.vim
$(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
@rm vimcmd @rm vimcmd
opt_test.vim: ../option.c gen_opt_test.vim opt_test.vim: ../optiondefs.h gen_opt_test.vim
$(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h
test_xxd.res: test_xxd.res:
XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim

2
src/version.c
View File

@@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2028,
/**/ /**/
2027, 2027,
/**/ /**/