patch 8.1.2259: running tests may leave XfakeHOME behind

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.

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 7aec010c89c12ad096d8edc6156524fdc616784a..66839d63bf1b24282c717effdea9134a79094b3f 100644 (file)
--- 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 d4290f96f0510770052657369f4b4ae47d6cf3d4..a0520e0fb41058bb6a106f25caf0e2cb9be5d76f 100644 (file)
--- 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 464de12ae60a765b189d91cb7955bdf8e7ec48c0..0a210b6ea4891e4927f0053f633215d559f910da 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2259,
 /**/
     2258,
 /**/