summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-19 18:57:23 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-19 18:57:23 +0100
commitc6ca9f3a29bfd6f5269749036f79f63ce6289692 (patch)
treea0233c7e404d75569e178a7d0eaf3a9e2cd47230 /src
parent2bede173a177e227e6224a8713f5b88a38d011af (diff)
downloadvim-git-c6ca9f3a29bfd6f5269749036f79f63ce6289692.tar.gz
patch 8.2.2016: swap file test is a little flakyv8.2.2016
Problem: Swap file test is a little flaky. Solution: Don't set a byte to a fixed value, increment it.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_swap.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index 8a6d81c5d..4bc73097c 100644
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -417,7 +417,7 @@ func Test_swap_auto_delete()
" swap file should be automatically deleted.
bwipe!
" change the process ID to avoid the "still running" warning
- let swapfile_bytes[24] = 0x99
+ let swapfile_bytes[24] = swapfile_bytes[24] + 1
call writefile(swapfile_bytes, swapfile_name)
edit Xtest.scr
" will end up using the same swap file after deleting the existing one
@@ -433,7 +433,7 @@ func Test_swap_auto_delete()
augroup END
" change the host name
- let swapfile_bytes[28 + 40] = 0x89
+ let swapfile_bytes[28 + 40] = swapfile_bytes[28 + 40] + 2
call writefile(swapfile_bytes, swapfile_name)
edit Xtest.scr
call assert_equal(1, filereadable(swapfile_name))
diff --git a/src/version.c b/src/version.c
index 1170a7fdb..01cf3c935 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2016,
+/**/
2015,
/**/
2014,