Skip to content

Commit 1ce9a15

Browse files
committed
patch 8.1.0185: running tests writes lua.vim even though it is not used
Problem: Running tests writes lua.vim even though it is not used. Solution: Stop writing lua.vim.
1 parent b6959a8 commit 1ce9a15

File tree

6 files changed

+3
-9
lines changed

6 files changed

+3
-9
lines changed

src/testdir/Make_dos.mak

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ clean:
8585
-if exist tiny.vim del tiny.vim
8686
-if exist mbyte.vim del mbyte.vim
8787
-if exist mzscheme.vim del mzscheme.vim
88-
-if exist lua.vim del lua.vim
8988
-if exist Xdir1 rd /s /q Xdir1
9089
-if exist Xfind rd /s /q Xfind
9190
-if exist XfakeHOME rd /s /q XfakeHOME

src/testdir/Make_ming.mak

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ clean:
7575
-@if exist tiny.vim $(DEL) tiny.vim
7676
-@if exist mbyte.vim $(DEL) mbyte.vim
7777
-@if exist mzscheme.vim $(DEL) mzscheme.vim
78-
-@if exist lua.vim $(DEL) lua.vim
7978
-@if exist Xdir1 $(DELDIR) Xdir1
8079
-@if exist Xfind $(DELDIR) Xfind
8180
-@if exist XfakeHOME $(DELDIR) XfakeHOME

src/testdir/Make_vms.mms

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,5 @@ clean :
208208
-@ if "''F$SEARCH("small.vim")'" .NES. "" then delete/noconfirm/nolog small.vim.*
209209
-@ if "''F$SEARCH("mbyte.vim")'" .NES. "" then delete/noconfirm/nolog mbyte.vim.*
210210
-@ if "''F$SEARCH("mzscheme.vim")'" .NES. "" then delete/noconfirm/nolog mzscheme.vim.*
211-
-@ if "''F$SEARCH("lua.vim")'" .NES. "" then delete/noconfirm/nolog lua.vim.*
212211
-@ if "''F$SEARCH("viminfo.*")'" .NES. "" then delete/noconfirm/nolog viminfo.*.*
213212

src/testdir/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(VIMPROG)
5151
$(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(SCRIPTS_FIRST)
5252

5353
RM_ON_RUN = test.out X* viminfo
54-
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok benchmark.out
54+
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out
5555
RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
5656

5757
clean:

src/testdir/test1.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ If Vim was not compiled with the +multi_byte feature, the mbyte.vim script will
1515
be set like small.vim above. mbyte.vim is sourced by tests that require the
1616
+multi_byte feature.
1717
Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
18-
Similar logic is applied to the +lua feature, using lua.vim.
1918

2019
STARTTEST
2120
:" If columns or lines are too small, create wrongtermsize.
@@ -33,17 +32,13 @@ w! test.out
3332
qa!
3433
:w! mbyte.vim
3534
:w! mzscheme.vim
36-
:w! lua.vim
3735
:"
3836
:" If +multi_byte feature supported, make mbyte.vim empty.
3937
:if has("multi_byte") | sp another | w! mbyte.vim | q | endif
4038
:"
4139
:" If +mzscheme feature supported, make mzscheme.vim empty.
4240
:if has("mzscheme") | sp another | w! mzscheme.vim | q | endif
4341
:"
44-
:" If +lua feature supported, make lua.vim empty.
45-
:if has("lua") | sp another | w! lua.vim | q | endif
46-
:"
4742
:" If +eval feature supported quit here, leaving tiny.vim and small.vim empty.
4843
:" Otherwise write small.vim to skip the test.
4944
:if 1 | q! | endif

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,8 @@ static char *(features[]) =
789789

790790
static int included_patches[] =
791791
{ /* Add new patch number below this line */
792+
/**/
793+
185,
792794
/**/
793795
184,
794796
/**/

0 commit comments

Comments
 (0)