# HG changeset patch # User Christian Brabandt # Date 1451421904 -3600 # Node ID 702f694c9396329f25472103a9db86c162937ae2 # Parent 7423080fdb38f8647daec80908a198465df3824e commit https://github.com/vim/vim/commit/f9c8bd2137b045f9a64d63eefcf022b4726b1419 Author: Bram Moolenaar Date: Tue Dec 29 21:34:48 2015 +0100 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. diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -2461,7 +2461,7 @@ SHADOWDIR = shadow shadow: runtime pixmaps mkdir $(SHADOWDIR) - cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs . + cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_gresources.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs . mkdir $(SHADOWDIR)/auto cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . mkdir $(SHADOWDIR)/po @@ -2480,6 +2480,7 @@ shadow: runtime pixmaps fi mkdir $(SHADOWDIR)/testdir cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \ + ../../testdir/Make_all.mak \ ../../testdir/vimrc.unix \ ../../testdir/*.in \ ../../testdir/*.vim \ diff --git a/src/testdir/test49.in b/src/testdir/test49.in --- a/src/testdir/test49.in +++ b/src/testdir/test49.in @@ -8,7 +8,9 @@ STARTTEST :se nocp nomore viminfo+=nviminfo :lang mess C :so test49.vim -GGGGGGGGGGGGGG"rp:.-,$w! test.out +:" Go back to this file and append the results from register r. +:buf test49.in +G"rp:/^Results/,$w! test.out :" :" make valgrind happy :redir => funclist diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 998, +/**/ 997, /**/ 996,