patch 8.0.0428: git and hg see new files after running tests

Problem:    Git and hg see new files after running tests. (Manuel Ortega)
Solution:   Add the generated file to .hgignore (or .gitignore). Delete the
            resulting verbose file. (Christian Brabandt)  Improve dependency
            on opt_test.vim.  Reset the 'more' option.

diff --git a/.gitignore b/.gitignore
index ac3a86367ad6f8582d916c7bd130c7e4207859d9..07adcb61a4623c5a14537e3acce55b386ac5cf89 100644 (file)
--- 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

diff --git a/Filelist b/Filelist
index 99f72d0fba21374a80dbc5d8fea6be8564696cf9..2aeea2800e7bd45d717bcf68f03fec4d6fecdf22 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -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 f9453229aaffd4068b03b59fe7850d718af67eeb..26658ccc2f7a566df326c5c227d2f7c94939df60 100644 (file)
--- 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 b7fb15caf6779859ebd2c94562f3c27151b6f08b..17c60281f60f9c79e039a4e5318602a57a2056ea 100644 (file)
--- 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 7c44024fc33445d517e0b7417aa4ad621baa28c7..1a98ebb5418f8d440daca6edc0b87fbb379de4f6 100644 (file)
--- 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 61d77d2f53d9227450a3dbd387be0c21c7986b1d..8235b959a7427cb956d09510c4ae70bf2b9bb075 100644 (file)
--- 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 ac75e43577c28ad01b1ae509ee859717cd8f4c03..e44bd5c7ba6f72e63598684e589f2daecd34ac97 100644 (file)
--- 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
similarity index 97%
rename from src/gen_opt_test.vim
rename to src/testdir/gen_opt_test.vim
index 677aa74e34b7c4e3d5ee6802e3b8276301ed0ea8..07a744bc0da5a020f34a0a84e99f9521e6699019 100644 (file)
--- 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 962f5b8d166347f6a7761ec9ca5478e30b60f02b..983a4259ea68fd746dbce9e434d8e57fc05d0410 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    428,
 /**/
     427,
 /**/