thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0185: running tests writes lua.vim even though it is not used

Browse Source 
Problem:    Running tests writes lua.vim even though it is not used.
Solution:   Stop writing lua.vim.
This commit is contained in:
Bram Moolenaar
2018-07-14 21:48:46 +02:00
parent b6959a8e06
commit 1ce9a1515b
6 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/testdir/Make_dos.mak
View File

@@ -85,7 +85,6 @@ clean:
-if exist tiny.vim del tiny.vim -if exist tiny.vim del tiny.vim
-if exist mbyte.vim del mbyte.vim -if exist mbyte.vim del mbyte.vim
-if exist mzscheme.vim del mzscheme.vim -if exist mzscheme.vim del mzscheme.vim
-if exist lua.vim del lua.vim
-if exist Xdir1 rd /s /q Xdir1 -if exist Xdir1 rd /s /q Xdir1
-if exist Xfind rd /s /q Xfind -if exist Xfind rd /s /q Xfind
-if exist XfakeHOME rd /s /q XfakeHOME -if exist XfakeHOME rd /s /q XfakeHOME

1
src/testdir/Make_ming.mak
View File

@@ -75,7 +75,6 @@ clean:
-@if exist tiny.vim $(DEL) tiny.vim -@if exist tiny.vim $(DEL) tiny.vim
-@if exist mbyte.vim $(DEL) mbyte.vim -@if exist mbyte.vim $(DEL) mbyte.vim
-@if exist mzscheme.vim $(DEL) mzscheme.vim -@if exist mzscheme.vim $(DEL) mzscheme.vim
-@if exist lua.vim $(DEL) lua.vim
-@if exist Xdir1 $(DELDIR) Xdir1 -@if exist Xdir1 $(DELDIR) Xdir1
-@if exist Xfind $(DELDIR) Xfind -@if exist Xfind $(DELDIR) Xfind
-@if exist XfakeHOME $(DELDIR) XfakeHOME -@if exist XfakeHOME $(DELDIR) XfakeHOME

1
src/testdir/Make_vms.mms
View File

@@ -208,6 +208,5 @@ clean :
-@ if "''F$SEARCH("small.vim")'" .NES. "" then delete/noconfirm/nolog small.vim.* -@ if "''F$SEARCH("small.vim")'" .NES. "" then delete/noconfirm/nolog small.vim.*
-@ if "''F$SEARCH("mbyte.vim")'" .NES. "" then delete/noconfirm/nolog mbyte.vim.* -@ if "''F$SEARCH("mbyte.vim")'" .NES. "" then delete/noconfirm/nolog mbyte.vim.*
-@ if "''F$SEARCH("mzscheme.vim")'" .NES. "" then delete/noconfirm/nolog mzscheme.vim.* -@ if "''F$SEARCH("mzscheme.vim")'" .NES. "" then delete/noconfirm/nolog mzscheme.vim.*
-@ if "''F$SEARCH("lua.vim")'" .NES. "" then delete/noconfirm/nolog lua.vim.*
-@ if "''F$SEARCH("viminfo.*")'" .NES. "" then delete/noconfirm/nolog viminfo.*.* -@ if "''F$SEARCH("viminfo.*")'" .NES. "" then delete/noconfirm/nolog viminfo.*.*

2
src/testdir/Makefile
View File

@@ -51,7 +51,7 @@ $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(VIMPROG)
$(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(SCRIPTS_FIRST)
RM_ON_RUN = test.out X* viminfo RM_ON_RUN = test.out X* viminfo
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok benchmark.out RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out
RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
clean: clean:

5
src/testdir/test1.in
View File

@@ -15,7 +15,6 @@ If Vim was not compiled with the +multi_byte feature, the mbyte.vim script will
be set like small.vim above. mbyte.vim is sourced by tests that require the be set like small.vim above. mbyte.vim is sourced by tests that require the
+multi_byte feature. +multi_byte feature.
Similar logic is applied to the +mzscheme feature, using mzscheme.vim. Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
Similar logic is applied to the +lua feature, using lua.vim.
STARTTEST STARTTEST
:" If columns or lines are too small, create wrongtermsize. :" If columns or lines are too small, create wrongtermsize.
@@ -33,7 +32,6 @@ w! test.out
qa! qa!
:w! mbyte.vim :w! mbyte.vim
:w! mzscheme.vim :w! mzscheme.vim
:w! lua.vim
:" :"
:" If +multi_byte feature supported, make mbyte.vim empty. :" If +multi_byte feature supported, make mbyte.vim empty.
:if has("multi_byte") | sp another | w! mbyte.vim | q | endif :if has("multi_byte") | sp another | w! mbyte.vim | q | endif
@@ -41,9 +39,6 @@ qa!
:" If +mzscheme feature supported, make mzscheme.vim empty. :" If +mzscheme feature supported, make mzscheme.vim empty.
:if has("mzscheme") | sp another | w! mzscheme.vim | q | endif :if has("mzscheme") | sp another | w! mzscheme.vim | q | endif
:" :"
:" If +lua feature supported, make lua.vim empty.
:if has("lua") | sp another | w! lua.vim | q | endif
:"
:" If +eval feature supported quit here, leaving tiny.vim and small.vim empty. :" If +eval feature supported quit here, leaving tiny.vim and small.vim empty.
:" Otherwise write small.vim to skip the test. :" Otherwise write small.vim to skip the test.
:if 1 | q! | endif :if 1 | q! | endif

2
src/version.c
View File

@@ -789,6 +789,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
185,
/**/ /**/
184, 184,
/**/ /**/