patch 9.0.1843: xxd color test flaky
Commit:
https://github.com/vim/vim/commit/b2422f75408a41c77620c0d0f956b9728810c6ef
Author: Christian Brabandt <[email protected]>
Date: Sat Sep 2 16:01:18 2023 +0200
patch 9.0.1843: xxd color test flaky
Problem: xxd color test flaky
Solution: Filter unneeded lines
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/dumps/Test_xxd_color_1.dump
b/src/testdir/dumps/Test_xxd_color_1.dump
index da6282104..38908618f 100644
--- 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
index 000000000..bc6226ad2
--- /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|.*
#|$+0\&\#ffffff0| #e
diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index 66ffa54ad..437437ebc 100644
--- 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 a09c72513..ae2886484 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qcROx-00C8Pv-MQ%40256bit.org.
