diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-06-23 21:44:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-23 21:44:06 +0200 |
| commit | 6738fd2000f0bea4d40f4a8651e0e1f4b0503bb3 (patch) | |
| tree | 02eadd5202a2803cf01b5882b2f33fa0a4cb2f25 | |
| parent | 44dea9da4b2a21dd1e03f2bd94b4f2679d4613e5 (diff) | |
| download | vim-git-6738fd2000f0bea4d40f4a8651e0e1f4b0503bb3.tar.gz | |
patch 8.2.3042: swap file test failsv8.2.3042
Problem: Swap file test fails.
Solution: Check for a very high process ID instead of one, which should be
running.
| -rw-r--r-- | src/testdir/test_swap.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim index 90afb4d6f..caacd7e17 100644 --- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -201,8 +201,8 @@ func Test_swapfile_delete() " This test won't work as root because root can successfully run kill(1, 0) if !IsRoot() " Write the swapfile with a modified PID, now it will be automatically - " deleted. Process one should never be Vim. - let swapfile_bytes[24:27] = 0z01000000 + " deleted. Process 0x3fffffff most likely does not exist. + let swapfile_bytes[24:27] = 0zffffff3f call writefile(swapfile_bytes, swapfile_name) let s:swapname = '' split XswapfileText diff --git a/src/version.c b/src/version.c index 79f05ccf7..1ec8342d6 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3042, +/**/ 3041, /**/ 3040, |