patch 9.0.1843: xxd color test flaky

Problem:  xxd color test flaky
Solution: Filter unneeded lines

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/dumps/Test_xxd_color_1.dump b/src/testdir/dumps/Test_xxd_color_1.dump
index da62821045bab76d1f07cb96c597f0c1eddf962d..38908618f67cab8bb951c1abc5e4bc46b69acce0 100644 (file)
--- a/src/testdir/dumps/Test_xxd_color_1.dump
+++ b/src/testdir/dumps/Test_xxd_color_1.dump
@@ -14,7 +14,3 @@
 |0@5|d|0|:| |d+2#e000002&|0|d|1| +0#0000000&|d+2#e000002&|2|d|3| +0#0000000&|d+2#e000002&|4|d|5| +0#0000000&|d+2#e000002&|6|d|7| +0#0000000&|d+2#e000002&|8|d|9| +0#0000000&|d+2#e000002&|a|d|b| +0#0000000&|d+2#e000002&|c|d@1| +0#0000000&|d+2#e000002&|e|d|f| +0#0000000&@1|.+2#e000002&@15| +0#0000000&@7
 |0@5|e|0|:| |e+2#e000002&|0|e|1| +0#0000000&|e+2#e000002&|2|e|3| +0#0000000&|e+2#e000002&|4|e|5| +0#0000000&|e+2#e000002&|6|e|7| +0#0000000&|e+2#e000002&|8|e|9| +0#0000000&|e+2#e000002&|a|e|b| +0#0000000&|e+2#e000002&|c|e|d| +0#0000000&|e+2#e000002&@2|f| +0#0000000&@1|.+2#e000002&@15| +0#0000000&@7
 |0@5|f|0|:| |f+2#e000002&|0|f|1| +0#0000000&|f+2#e000002&|2|f|3| +0#0000000&|f+2#e000002&|4|f|5| +0#0000000&|f+2#e000002&|6|f|7| +0#0000000&|f+2#e000002&|8|f|9| +0#0000000&|f+2#e000002&|a|f|b| +0#0000000&|f+2#e000002&|c|f|d| +0#0000000&|f+2#e000002&|e|f+2#0000e05&@1| +0#0000000&@1|.+2#e000002&@14|.+2#0000e05&| +0#0000000&@7
-|$| > @72
-@75
-@75
-@75

diff --git a/src/testdir/dumps/Test_xxd_color_1.vim b/src/testdir/dumps/Test_xxd_color_1.vim
new file mode 100644 (file)
index 0000000..bc6226a
--- /dev/null
+++ b/src/testdir/dumps/Test_xxd_color_1.vim
@@ -0,0 +1,3 @@
+" Filter that removes the Shell Prompt from the xxd command
+18,20d
+:1s#|\$+0&\#ffffff0| |.@1|/|x@1|d|/|x@1|d|.*\n#|$+0\&\#ffffff0| #e

diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index 66ffa54aded269ba155898088f7b8402b3182320..437437ebc18301bec273a3da9bc3ac9a7631cc1f 100644 (file)
--- a/src/testdir/test_xxd.vim
+++ b/src/testdir/test_xxd.vim
@@ -577,6 +577,7 @@ func Test_xxd_color2()
 
   call system(s:xxd_cmd .. ' -r < Xinput > XXDfile_colors')
 
+  let $PS1='$ '
   let buf = RunVimInTerminal('', #{rows: 20, cmd: 'sh'})
   call term_sendkeys(buf,  s:xxd_cmd .. " -R never  < XXDfile_colors\<cr>")
   call TermWait(buf)
@@ -591,5 +592,6 @@ func Test_xxd_color2()
   call term_sendkeys(buf,  "exit\<CR>")
 
   call delete('XXDfile_colors')
+  unlet! $PS1
 endfunc
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index a09c725138ef827a4e79e7084d38bba96eabfabe..ae288648416cdcc22b2a4d41949de81b3e8c3cbf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1843,
 /**/
     1842,
 /**/