diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-22 13:12:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-22 13:12:29 +0200 |
| commit | 1c5a2134dbf880859281c676b834c5a636f78f52 (patch) | |
| tree | ba6f8569f0dc1a593e912dd7ef6d82e59b23477b | |
| parent | e968e36a00ddc735d493906f04eb207ff9aeb87c (diff) | |
| download | vim-git-1c5a2134dbf880859281c676b834c5a636f78f52.tar.gz | |
updated for version 7.4.296v7.4.296
Problem: Can't run tests on Solaris.
Solution: Change the way VIMRUNTIME is set. (Laurent Blume)
| -rw-r--r-- | src/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 65c82e089..8ae35b918 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -57,7 +57,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) RM_ON_RUN = test.out X* viminfo RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok -RUN_VIM = export VIMRUNTIME=$(SCRIPTSOURCE); $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in +RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in clean: -rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.* diff --git a/src/version.c b/src/version.c index 3ea187df2..93d213088 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 296, +/**/ 295, /**/ 294, |