patch 9.1.1312: tests: Test_backupskip() fails when HOME is defined

Problem:  tests: Test_backupskip() fails when HOME is defined
Solution: unset $HOME temporarily

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index d8ad3f210bf5d3916a1d456d107d37a3c12e5579..9708fcc051e8dc2be83a372a9f5eefc06a7dfebd 100644 (file)
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -1168,11 +1168,14 @@ func Test_backupskip()
     call setenv(var, '/duplicate/path')
   endfor
 
+  " unset $HOME, so that it won't try to read init files
+  let saveenv['HOME'] = getenv("HOME")
+  call setenv('HOME', v:null)
   exe 'silent !' . cmd
   call assert_equal(['errors:'], readfile('Xtestout'))
 
   " restore environment variables
-  for var in ['TMPDIR', 'TMP', 'TEMP']
+  for var in ['TMPDIR', 'TMP', 'TEMP', 'HOME']
     call setenv(var, saveenv[var])
   endfor
 

diff --git a/src/version.c b/src/version.c
index 7aae2b50829230c48daba353eed0a90df69199c5..2a51b4207ab38d9d58d851fbab00ca0b628af772 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1312,
 /**/
     1311,
 /**/