patch 8.1.0823: not sufficient testing of xxd

Problem:    Not sufficient testing of xxd.
Solution:   Add some more test coverage.

diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index b1a7b0888ff1c7614a052598435504caef81f56b..776266711987334c726c2ac7e4bad68b0d111cdd 100644 (file)
--- a/src/testdir/test_xxd.vim
+++ b/src/testdir/test_xxd.vim
@@ -75,7 +75,7 @@ func Test_xxd()
   let s:test += 1
   for arg in ['-l 13', '-l13', '-len 13']
     %d
-    exe '0r! ' . s:xxd_cmd . ' -s 0x36 -l 13 -cols 13 ' . fname
+    exe '0r! ' . s:xxd_cmd . ' -s 0x36 ' . arg . ' -cols 13 ' . fname
     $d
     call assert_equal('00000036: 3231 7374 204d 6179 2031 3939 36  21st May 1996', getline(1), s:Mess(s:test))
   endfor
@@ -131,6 +131,24 @@ func Test_xxd()
     call delete('XXDfile')
   endfor
 
+  " Test 11: reverse with CR, hex upper, Postscript style with a TAB
+  let s:test += 1
+  call writefile([" 54455354\t610B6364 30390A             TESTa\0x0bcd09.\r"], 'Xinput')
+  silent exe '!' . s:xxd_cmd . ' -r -p < Xinput > XXDfile'
+  let blob = readfile('XXDfile', 'B')
+  call assert_equal(0z54455354.610B6364.30390A, blob)
+  call delete('Xinput')
+  call delete('XXDfile')
+
+  " Test 12: reverse with seek
+  let s:test += 1
+  call writefile(["00000000: 54455354\t610B6364 30390A             TESTa\0x0bcd09.\r"], 'Xinput')
+  silent exe '!' . s:xxd_cmd . ' -r -seek 5 < Xinput > XXDfile'
+  let blob = readfile('XXDfile', 'B')
+  call assert_equal(0z0000000000.54455354.610B6364.30390A, blob)
+  call delete('Xinput')
+  call delete('XXDfile')
+
   " TODO:
   " -o -offset
 

diff --git a/src/version.c b/src/version.c
index 4d7730cf55990a039139afe8f7ebe6a0f501c7cd..b9522911a4b6453252b2beade8ace25c7cd29646 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -787,6 +787,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    823,
 /**/
     822,
 /**/