Mercurial > vim
changeset 17391:8a43873df941 v8.1.1694
patch 8.1.1694: the RUN_VIM variable is longer than needed
commit https://github.com/vim/vim/commit/41a82604453080d0011f281532582d3bd360df4a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 14 21:54:26 2019 +0200
patch 8.1.1694: the RUN_VIM variable is longer than needed
Problem: The RUN_VIM variable is longer than needed.
Solution: Shorten RUN_VIM. (Daniel Hahler, closes https://github.com/vim/vim/issues/4643)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 14 Jul 2019 22:00:05 +0200 |
parents | 0ca3dc4c1e6d |
children | 27714a031226 |
files | src/testdir/Makefile src/testdir/shared.vim src/version.c |
diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -81,7 +81,7 @@ report: RM_ON_RUN = test.out X* viminfo RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out -RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in +RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in clean: -rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind @@ -150,7 +150,7 @@ nolog: # New style of tests uses Vim script with assert calls. These are easier # to write and a lot easier to read and debug. # Limitation: Only works with the +eval feature. -RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim +RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim newtests: newtestssilent @/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages; fi"
--- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -261,7 +261,7 @@ func GetVimCommand(...) let cmd = cmd . ' -u ' . name endif let cmd .= ' --not-a-term' - let cmd = substitute(cmd, 'VIMRUNTIME=.*VIMRUNTIME;', '', '') + let cmd = substitute(cmd, 'VIMRUNTIME=\S\+', '', '') " If using valgrind, make sure every run uses a different log file. if cmd =~ 'valgrind.*--log-file='