changeset 7387:702f694c9396 v7.4.998

commit https://github.com/vim/vim/commit/f9c8bd2137b045f9a64d63eefcf022b4726b1419 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Tue, 29 Dec 2015 21:45:04 +0100
parents 7423080fdb38
children 7f2a10970d7d
files src/Makefile src/testdir/test49.in src/version.c
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 \
--- 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
--- 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,