diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Filelist | 2 | ||||
-rw-r--r-- | src/Makefile | 4 | ||||
-rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
-rw-r--r-- | src/testdir/Make_dos.mak | 4 | ||||
-rw-r--r-- | src/testdir/Make_ming.mak | 3 | ||||
-rw-r--r-- | src/testdir/Makefile | 6 | ||||
-rw-r--r-- | src/testdir/gen_opt_test.vim (renamed from src/gen_opt_test.vim) | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
9 files changed, 25 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index ac3a86367a..07adcb61a4 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,7 @@ src/testdir/test.log src/testdir/dostmp/* src/testdir/messages src/testdir/viminfo +src/testdir/opt_test.vim src/memfile_test src/json_test src/message_test @@ -97,7 +97,7 @@ SRC_ALL = \ src/tee/tee.c \ src/xxd/xxd.c \ src/main.aap \ - src/gen_opt_test.vim \ + src/testdir/gen_opt_test.vim \ src/testdir/main.aap \ src/testdir/README.txt \ src/testdir/Make_all.mak \ diff --git a/src/Makefile b/src/Makefile index f9453229aa..26658ccc2f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2025,7 +2025,6 @@ test check: scripttests unittests # scripttests: $(MAKE) -f Makefile $(VIMTARGET) - $(MAKE) -f Makefile testdir/opt_test.vim if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \ fi @@ -2034,9 +2033,6 @@ scripttests: fi cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) -testdir/opt_test.vim: option.c gen_opt_test.vim - ./$(VIMTARGET) -u gen_opt_test.vim --noplugin --not-a-term - # Run the tests with the GUI. Assumes vim/gvim was already built testgui: cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) GUI_FLAG=-g $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index b7fb15caf6..17c60281f6 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -221,3 +221,4 @@ test49.out: test49.vim test60.out: test60.vim +test_options.res: opt_test.vim diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 7c44024fc3..1a98ebb541 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -94,6 +94,7 @@ clean: -if exist test.log del test.log -if exist messages del messages -if exist benchmark.out del benchmark.out + -if exist opt_test.vim del opt_test.vim nolog: -if exist test.log del test.log @@ -127,3 +128,6 @@ test_gui_init.res: test_gui_init.vim @echo "$(VIMPROG)" > vimcmd $(VIMPROG) -u NONE -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $*.vim @del vimcmd + +opt_test.vim: ../option.c gen_opt_test.vim + $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index 61d77d2f53..8235b959a7 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -88,6 +88,7 @@ clean: -@if exist viminfo $(DEL) viminfo -@if exist test.log $(DEL) test.log -@if exist messages $(DEL) messages + -@if exist opt_test.vim $(DEL) opt_test.vim .in.out: -@if exist $*.ok $(CP) $*.ok test.ok @@ -131,3 +132,5 @@ test_gui_init.res: test_gui_init.vim $(VIMPROG) -u NONE -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @$(DEL) vimcmd +opt_test.vim: ../option.c gen_opt_test.vim + $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term diff --git a/src/testdir/Makefile b/src/testdir/Makefile index ac75e43577..e44bd5c7ba 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -55,7 +55,7 @@ RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok benchmar RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in clean: - -rm -rf *.out *.failed *.res *.rej *.orig test.log messages $(RM_ON_RUN) $(RM_ON_START) valgrind.* + -rm -rf *.out *.failed *.res *.rej *.orig opt_test.vim test.log messages $(RM_ON_RUN) $(RM_ON_START) valgrind.* test1.out: test1.in -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize @@ -140,3 +140,7 @@ test_gui_init.res: test_gui_init.vim @echo "$(RUN_GVIMTEST_WITH_GVIMRC)" > vimcmd $(RUN_VIMTEST) -u NONE -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @rm vimcmd + +opt_test.vim: ../option.c gen_opt_test.vim + $(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term + diff --git a/src/gen_opt_test.vim b/src/testdir/gen_opt_test.vim index 677aa74e34..07a744bc0d 100644 --- a/src/gen_opt_test.vim +++ b/src/testdir/gen_opt_test.vim @@ -169,6 +169,10 @@ while 1 for val in a[0] call add(script, 'set ' . name . '=' . val) call add(script, 'set ' . shortname . '=' . val) + + if name == 'verbosefile' && !empty(val) + call add(script, 'call delete("'. val. '")') + endif endfor " setting an option can only fail when it's implemented. @@ -182,6 +186,10 @@ while 1 call add(script, 'set ' . name . '&') call add(script, 'set ' . shortname . '&') + + if name == 'more' + call add(script, 'set nomore') + endif endif endwhile diff --git a/src/version.c b/src/version.c index 962f5b8d16..983a4259ea 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 428, +/**/ 427, /**/ 426, |