diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-05 22:37:20 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-05 22:37:20 +0100 |
| commit | 7d2320414ffdd698c9a17d775f71e2c455c21624 (patch) | |
| tree | 84ea1ff797c003be62948be2f09f224ee621b2b8 /src | |
| parent | dc968e7a45c672a81148628b755c2a440a228ad7 (diff) | |
patch 8.1.2259: running tests may leave XfakeHOME behindv8.1.2259
Problem: Running tests may leave XfakeHOME behind.
Solution: Source summarize.vim without using setup.vim. (closes #5177)
Also fix that on MS-Windows the test log isn't echoed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/Make_dos.mak | 2 | ||||
| -rw-r--r-- | src/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 7aec010c89..66839d63bf 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -75,7 +75,7 @@ report: $(VIMPROG) -u NONE $(NO_INITS) -S summarize.vim messages @echo. @echo Test results: - @type test_result.log + @cmd /c type test_result.log @if exist test.log ( echo TEST FAILURE & exit /b 1 ) \ else ( echo ALL DONE ) diff --git a/src/testdir/Makefile b/src/testdir/Makefile index d4290f96f0..a0520e0fb4 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -54,7 +54,7 @@ report: then cp test.log test_result.log; \ else echo No failures reported > test_result.log; \ fi" - $(RUN_VIMTEST) $(NO_INITS) -S summarize.vim messages $(REDIR_TEST_TO_NULL) + $(VIMPROG) -u NONE $(NO_INITS) -S summarize.vim messages $(REDIR_TEST_TO_NULL) @echo @echo 'Test results:' @cat test_result.log diff --git a/src/version.c b/src/version.c index 464de12ae6..0a210b6ea4 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2259, +/**/ 2258, /**/ 2257, |