patch 8.1.2028: options test script does not work

Problem:    Options test script does not work.
Solution:   Use optiondefs.h for input.

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 5776a7946d9e12e54bd072542d0e5ceddbfa8637..eda1a521cd8ba2a94cb2a30c146d42cad1a34652 100644 (file)
--- 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 2ad34b9b5afd215005203057176125a6f95e3081..671caa24f323fc99ccfe2d187aa2bd572fcf4c3b 100644 (file)
--- 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 0efebb5a37545d8e2c7c31f5ea36750626ed53a1..bcf2f8c37bc7d2011c619a0471c698f5d98b0a77 100644 (file)
--- 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 929a4c6400ecef4788cb69553b5bc93aa4731672..f76dde79f1b09cb55b9bd884d7eb63ef11817216 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2028,
 /**/
     2027,
 /**/