diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-14 21:54:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-14 21:54:26 +0200 |
| commit | 41a82604453080d0011f281532582d3bd360df4a (patch) | |
| tree | 433339a0093d9d671f83c219a9af802087dcdffd | |
| parent | f9cc9f209ede9f15959e4c2351e970477c139614 (diff) | |
patch 8.1.1694: the RUN_VIM variable is longer than neededv8.1.1694
Problem: The RUN_VIM variable is longer than needed.
Solution: Shorten RUN_VIM. (Daniel Hahler, closes #4643)
| -rw-r--r-- | src/testdir/Makefile | 4 | ||||
| -rw-r--r-- | src/testdir/shared.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 470f41ef50..0efebb5a37 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -81,7 +81,7 @@ $(NEW_TESTS): 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" diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index e1bb8184d7..9e4b1bb012 100644 --- 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=' diff --git a/src/version.c b/src/version.c index 75fa9c5cac..cca8b5bdd2 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1694, +/**/ 1693, /**/ 1692, |