summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-29 23:01:57 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-29 23:01:57 +0200
commit30fe88677dd2b16e733ca0ac14edc8d70c7259fc (patch)
treed916c2f267c8547744d22b41a99e2cbf669ba617
parentd507a685ad9cd270e5afc3bd4aa6a80ddb0d8802 (diff)
patch 8.0.0809: MS-Windows: tests hangv8.0.0809
Problem: MS-Windows: tests hang. Solution: Delete the XfakeHOME directory.
-rw-r--r--src/testdir/Make_dos.mak2
-rw-r--r--src/testdir/Make_ming.mak2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index fe2e2ba25f..2c00a156f1 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -54,6 +54,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
-@if exist test.ok del test.ok
-@if exist Xdir1 rd /s /q Xdir1
-@if exist Xfind rd /s /q Xfind
+ -@if exist XfakeHOME rd /s /q XfakeHOME
-@del X*
-@if exist viminfo del viminfo
$(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=unix|f test.out|wq" \
@@ -89,6 +90,7 @@ clean:
-if exist lua.vim del lua.vim
-if exist Xdir1 rd /s /q Xdir1
-if exist Xfind rd /s /q Xfind
+ -if exist XfakeHOME rd /s /q XfakeHOME
-del X*
-for /d %i in (X*) do @rmdir /s/q %i
-if exist viminfo del viminfo
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 31dfe702b7..3d7cf3fc65 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -84,6 +84,7 @@ clean:
-@if exist lua.vim $(DEL) lua.vim
-@if exist Xdir1 $(DELDIR) Xdir1
-@if exist Xfind $(DELDIR) Xfind
+ -@if exist XfakeHOME $(DELDIR) XfakeHOME
-@if exist X* $(DEL) X*
-@if exist viminfo $(DEL) viminfo
-@if exist test.log $(DEL) test.log
@@ -98,6 +99,7 @@ clean:
@$(MV) test.out $*.out
-@if exist Xdir1 $(DELDIR) Xdir1
-@if exist Xfind $(DELDIR) Xfind
+ -@if exist XfakeHOME $(DELDIR) XfakeHOME
-@if exist X* $(DEL) X*
-@if exist test.ok $(DEL) test.ok
-@if exist viminfo $(DEL) viminfo
diff --git a/src/version.c b/src/version.c
index ab9f30eaf5..94aa40e763 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 809,
+/**/
808,
/**/
807,