To: vim_dev@googlegroups.com Subject: Patch 8.1.2028 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2028 Problem: Options test script does not work. Solution: Use optiondefs.h for input. Files: src/testdir/Makefile, src/testdir/Make_dos.mak, src/testdir/Make_ming.mak *** ../vim-8.1.2027/src/testdir/Makefile 2019-07-14 21:54:23.279146889 +0200 --- src/testdir/Makefile 2019-09-14 15:45:59.194383668 +0200 *************** *** 83,88 **** --- 83,90 ---- 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,183 **** $(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 test_xxd.res: XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim --- 178,185 ---- $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @rm vimcmd ! 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 *** ../vim-8.1.2027/src/testdir/Make_dos.mak 2019-01-11 19:19:40.685585822 +0100 --- src/testdir/Make_dos.mak 2019-09-14 15:45:13.322556737 +0200 *************** *** 134,138 **** 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 --- 134,138 ---- test_options.res test_alot.res: opt_test.vim ! opt_test.vim: ../optiondefs.h gen_opt_test.vim ! $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h *** ../vim-8.1.2027/src/testdir/Make_ming.mak 2019-01-24 12:18:43.448842486 +0100 --- src/testdir/Make_ming.mak 2019-09-14 15:45:22.046523827 +0200 *************** *** 138,142 **** 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 --- 138,142 ---- test_options.res test_alot.res: opt_test.vim ! opt_test.vim: ../optiondefs.h gen_opt_test.vim ! $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h *** ../vim-8.1.2027/src/version.c 2019-09-13 22:30:07.592524088 +0200 --- src/version.c 2019-09-14 15:46:13.698328964 +0200 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 2028, /**/ -- hundred-and-one symptoms of being an internet addict: 254. You wake up daily with your keyboard printed on your forehead. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///