patch 8.1.0264: backup tests fail when CWD is in /tmp

Problem:    Backup tests fail when CWD is in /tmp.
Solution:   Make 'backupskip' empty. (Christian Brabandt, closes #3301)

diff --git a/src/testdir/test_backup.vim b/src/testdir/test_backup.vim
index 0981efdcee2f99301de20597d974c619b2d7c565..ce2bfe72bc444aa8cf76de9366a4058113582914 100644 (file)
--- a/src/testdir/test_backup.vim
+++ b/src/testdir/test_backup.vim
@@ -1,7 +1,7 @@
 " Tests for the backup function
 
 func Test_backup()
-  set backup backupdir=.
+  set backup backupdir=. backupskip=
   new
   call setline(1, ['line1', 'line2'])
   :f Xbackup.txt
@@ -12,13 +12,13 @@ func Test_backup()
   let l = readfile('Xbackup.txt~')
   call assert_equal(['line1', 'line2'], l)
   bw!
-  set backup&vim backupdir&vim
+  set backup&vim backupdir&vim backupskip&vim
   call delete('Xbackup.txt')
   call delete('Xbackup.txt~')
 endfunc
 
 func Test_backup2()
-  set backup backupdir=.//
+  set backup backupdir=.// backupskip=
   new
   call setline(1, ['line1', 'line2', 'line3'])
   :f Xbackup.txt
@@ -34,11 +34,11 @@ func Test_backup2()
   bw!
   call delete('Xbackup.txt')
   call delete(f)
-  set backup&vim backupdir&vim
+  set backup&vim backupdir&vim backupskip&vim
 endfunc
 
 func Test_backup2_backupcopy()
-  set backup backupdir=.// backupcopy=yes
+  set backup backupdir=.// backupcopy=yes backupskip=
   new
   call setline(1, ['line1', 'line2', 'line3'])
   :f Xbackup.txt
@@ -54,5 +54,5 @@ func Test_backup2_backupcopy()
   bw!
   call delete('Xbackup.txt')
   call delete(f)
-  set backup&vim backupdir&vim backupcopy&vim
+  set backup&vim backupdir&vim backupcopy&vim backupskip&vim
 endfunc

diff --git a/src/version.c b/src/version.c
index 6543e91375dc7e9e8aafa1b0f422483a0db8a11b..2d047319d9f1541b6748c4ef2d0e3e41c60ead5f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    264,
 /**/
     263,
 /**/