Mercurial > vim
changeset 25929:51a1ff50bd24 v8.2.3498
patch 8.2.3498: recover test may fail on some systems
Commit: https://github.com/vim/vim/commit/37f341d7236ff8a1e886bbb0f0ba0700ad589373
Author: James McCoy <jamessan@jamessan.com>
Date: Mon Oct 11 21:04:37 2021 +0100
patch 8.2.3498: recover test may fail on some systems
Problem: Recover test may fail on some systems.
Solution: Adjust the little endian and 64 bit detection. (James McCoy,
closes #8941)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 11 Oct 2021 22:15:03 +0200 |
| parents | 49310ee63371 |
| children | f6cbd4c55846 |
| files | src/testdir/test_recover.vim src/version.c |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_recover.vim +++ b/src/testdir/test_recover.vim @@ -208,9 +208,11 @@ func Test_recover_corrupted_swap_file() " Not all fields are written in a system-independent manner. Detect whether " the test is running on a little or big-endian system, so the correct " corruption values can be set. - let little_endian = b[1008:1011] == 0z33323130 - " The swap file header fields can be either 32-bit or 64-bit. - let system_64bit = b[1012:1015] == 0z00000000 + " The B0_MAGIC_LONG field may be 32-bit or 64-bit, depending on the system, + " even though the value stored is only 32-bits. Therefore, need to check + " both the high and low 32-bits to compute these values. + let little_endian = (b[1008:1011] == 0z33323130) || (b[1012:1015] == 0z33323130) + let system_64bit = little_endian ? (b[1012:1015] == 0z00000000) : (b[1008:1011] == 0z00000000) " clear the B0_MAGIC_LONG field if system_64bit