Skip to content

Commit f9c8bd2

Browse files
committed
patch 7.4.998
Problem: Running tests in shadow directory fails. Test 49 fails. Solution: Link more files for the shadow directory. Make test 49 end up in the right buffer.
1 parent 4c7bb12 commit f9c8bd2

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

src/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2461,7 +2461,7 @@ SHADOWDIR = shadow
24612461

24622462
shadow: runtime pixmaps
24632463
mkdir $(SHADOWDIR)
2464-
cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
2464+
cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_gresources.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
24652465
mkdir $(SHADOWDIR)/auto
24662466
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
24672467
mkdir $(SHADOWDIR)/po
@@ -2480,6 +2480,7 @@ shadow: runtime pixmaps
24802480
fi
24812481
mkdir $(SHADOWDIR)/testdir
24822482
cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \
2483+
../../testdir/Make_all.mak \
24832484
../../testdir/vimrc.unix \
24842485
../../testdir/*.in \
24852486
../../testdir/*.vim \

src/testdir/test49.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ STARTTEST
88
:se nocp nomore viminfo+=nviminfo
99
:lang mess C
1010
:so test49.vim
11-
GGGGGGGGGGGGGG"rp:.-,$w! test.out
11+
:" Go back to this file and append the results from register r.
12+
:buf test49.in
13+
G"rp:/^Results/,$w! test.out
1214
:"
1315
:" make valgrind happy
1416
:redir => funclist

src/version.c

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

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
998,
744746
/**/
745747
997,
746748
/**/

0 commit comments

Comments
 (0)