Mercurial > vim
changeset 18066:8e10cabcde8a v8.1.2028
patch 8.1.2028: options test script does not work
Commit: https://github.com/vim/vim/commit/d9b0d83b13d2691e4544709abd87eac004715175
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 14 15:46:32 2019 +0200
patch 8.1.2028: options test script does not work
Problem: Options test script does not work.
Solution: Use optiondefs.h for input.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 14 Sep 2019 16:00:04 +0200 |
| parents | 2e037541c5dd |
| children | 9e20b59dd8ab |
| files | src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/testdir/Makefile src/version.c |
| diffstat | 4 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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