From f9c8bd2137b045f9a64d63eefcf022b4726b1419 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 29 Dec 2015 21:34:48 +0100 Subject: 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. --- src/Makefile | 3 ++- src/testdir/test49.in | 4 +++- src/version.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 2cbf6e4e5a..7cdf813020 100644 --- 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 index 5e1d6b461e..79f13f6a56 100644 --- 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 index baab661cbb..670c0af77e 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 998, /**/ 997, /**/ -- cgit v1.2.3