diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-14 15:46:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-14 15:46:32 +0200 |
| commit | d9b0d83b13d2691e4544709abd87eac004715175 (patch) | |
| tree | 6e5c779b4f4f12be9b8e0b366c2a7f16ed5dec24 | |
| parent | 57da69816872d53038e8a7e8dd4dc39a31192f0d (diff) | |
| download | vim-git-d9b0d83b13d2691e4544709abd87eac004715175.tar.gz | |
patch 8.1.2028: options test script does not workv8.1.2028
Problem: Options test script does not work.
Solution: Use optiondefs.h for input.
| -rw-r--r-- | src/testdir/Make_dos.mak | 4 | ||||
| -rw-r--r-- | src/testdir/Make_ming.mak | 4 | ||||
| -rw-r--r-- | src/testdir/Makefile | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 5776a7946..eda1a521c 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -134,5 +134,5 @@ test_gui_init.res: test_gui_init.vim test_options.res test_alot.res: opt_test.vim -opt_test.vim: ../option.c gen_opt_test.vim - $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c +opt_test.vim: ../optiondefs.h gen_opt_test.vim + $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index 2ad34b9b5..671caa24f 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -138,5 +138,5 @@ test_gui_init.res: test_gui_init.vim test_options.res test_alot.res: opt_test.vim -opt_test.vim: ../option.c gen_opt_test.vim - $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c +opt_test.vim: ../optiondefs.h gen_opt_test.vim + $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 0efebb5a3..bcf2f8c37 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -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 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: -rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind -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 $< @rm vimcmd -opt_test.vim: ../option.c gen_opt_test.vim - $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c +opt_test.vim: ../optiondefs.h gen_opt_test.vim + $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h test_xxd.res: XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim diff --git a/src/version.c b/src/version.c index 929a4c640..f76dde79f 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2028, +/**/ 2027, /**/ 2026, |