patch 8.2.3080: recover test fails on 32bit systems
Problem: Recover test fails on 32bit systems. (Ondřej Súkup)
Solution: Detect 32/64 bit systems. (Yegappan Lakshmanan, closes #8485,
closes #8479)
diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim
index 2db662f..6ef4376 100644
--- a/src/testdir/test_recover.vim
+++ b/src/testdir/test_recover.vim
@@ -202,10 +202,16 @@
" 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:1015] == 0z33323130.00000000
+ 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
" clear the B0_MAGIC_LONG field
- let b[1008:1015] = 0z0000000000000000
+ if system_64bit
+ let b[1008:1015] = 0z00000000.00000000
+ else
+ let b[1008:1011] = 0z00000000
+ endif
call writefile(b, sn)
let msg = execute('recover Xfile1')
call assert_match('the file has been damaged', msg)
@@ -243,7 +249,11 @@
" set the block number in a pointer entry to a negative number
let b = copy(save_b)
- let b[4104:4111] = little_endian ? 0z00000000.00000080 : 0z80000000.00000000
+ if system_64bit
+ let b[4104:4111] = little_endian ? 0z00000000.00000080 : 0z80000000.00000000
+ else
+ let b[4104:4107] = little_endian ? 0z00000080 : 0z80000000
+ endif
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
@@ -261,7 +271,11 @@
" set the number of lines in the data block to zero
let b = copy(save_b)
- let b[8208:8215] = 0z00000000.00000000
+ if system_64bit
+ let b[8208:8215] = 0z00000000.00000000
+ else
+ let b[8208:8211] = 0z00000000
+ endif
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
@@ -271,7 +285,11 @@
" use an invalid text start for the lines in a data block
let b = copy(save_b)
- let b[8216:8219] = 0z00000000
+ if system_64bit
+ let b[8216:8219] = 0z00000000
+ else
+ let b[8212:8215] = 0z00000000
+ endif
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
diff --git a/src/version.c b/src/version.c
index e9ad71b..ed97a52 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3080,
+/**/
3079,
/**/
3078,