From 41634af0e5cdaa70884ba27c21e624b83b7dc94c Mon Sep 17 00:00:00 2001
From: André Twupack <atwupack@mailbox.org>
Date: Wed, 13 Aug 2014 21:31:29 +0200
Subject: vim-patch:7.4.231

Problem:    An error in ":options" is not caught by the tests.
Solution:   Add a test for ":options".  Set $VIMRUNTIME for the tests so that
            it uses the current runtime files instead of the installed ones.

https://code.google.com/p/vim/source/detail?r=0a295a3c9e473512ad3b006a0fb752ad43d19094
---
 src/nvim/testdir/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/nvim/testdir/Makefile')

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 21f2928593..a7f9dd8fa1 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -5,6 +5,7 @@
 export SHELL := sh
 
 VIMPROG := ../../../build/bin/nvim
+SCRIPTSOURCE := ../../../runtime
 
 SCRIPTS := test_autoformat_join.out                                    \
            test_eval.out                                               \
@@ -29,7 +30,8 @@ SCRIPTS := test_autoformat_join.out                                    \
            test91.out  test92.out  test93.out  test94.out  test95.out  \
            test96.out  test97.out  test98.out  test99.out  test100.out \
            test101.out test102.out test103.out test104.out test105.out \
-           test106.out test107.out
+           test106.out test107.out \
+           test_options.out
 
 SCRIPTS_GUI := test16.out
 
@@ -86,7 +88,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) test1.out
 
 RM_ON_RUN   := test.out X* viminfo
 RM_ON_START := tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok
-RUN_VIM     := $(TOOL) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
+RUN_VIM     := export VIMRUNTIME=$(SCRIPTSOURCE); $(TOOL) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
 
 clean:
 	-rm -rf *.out          \
-- 
cgit