diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-08-09 22:26:38 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-08-09 22:26:38 +0200 |
commit | efe03738f69b1f63ea30226765db949539ee15f0 (patch) | |
tree | fe9ace7319a72d57ee8f8929343185dd66536b2e | |
parent | 4b16ee743e26d65ecfb6231f7fd57869c3e5ff0d (diff) |
patch 8.1.0264: backup tests fail when CWD is in /tmpv8.1.0264
Problem: Backup tests fail when CWD is in /tmp.
Solution: Make 'backupskip' empty. (Christian Brabandt, closes #3301)
-rw-r--r-- | src/testdir/test_backup.vim | 12 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/testdir/test_backup.vim b/src/testdir/test_backup.vim index 0981efdcee..ce2bfe72bc 100644 --- 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 6543e91375..2d047319d9 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 264, +/**/ 263, /**/ 262, |