From 06ed634db154a8fc70185f83a3ca097e4d698b6a Mon Sep 17 00:00:00 2001 From: James McCoy Date: Tue, 3 Sep 2024 22:46:31 +0200 Subject: [PATCH] patch 9.1.0711: tests: test_xxd may file when using different xxd Problem: tests: test_xxd may file when using different xxd Solution: Make Test_xxd_color_0 agnostic to xxd's path, similar to Test_xxd_color_1 by filtering out shell command prompt in screen dump file (James McCoy) If an alternative xxd path is provided, e.g., the system installed xxd, then the screen dump fails due to the difference in path. From test_xxd.vim: Found errors in Test_xxd_color2(): Run 1, 15:17:03 - 15:17:04: command line..script /tmp/autopkgtest-lxc.1auv5tlk/downtmp/autopkgtest_tmp/vim/src/testdir/runtest.vim[607]..function RunTheTest[57]..Test_xxd_color2[36]..VerifyScreenDump line 67: See dump file difference: call term_dumpdiff("testdir/failed/Test_xxd_color_0.dump", "testdir/dumps/Test_xxd_color_0.dump"); difference in line 1: "|$+0&#ffffff0| |/|u|s|r|/|b|i|n|/|x@1|d| |-|R| |n|e|v|e|r| @1|<| |X@1|D|f|i|l|e|_|c|o|l|o|r|s| @33" related: #15612 Signed-off-by: James McCoy Signed-off-by: Christian Brabandt --- src/testdir/dumps/Test_xxd_color_0.dump | 3 +-- src/testdir/dumps/Test_xxd_color_0.vim | 2 ++ src/version.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/testdir/dumps/Test_xxd_color_0.vim diff --git a/src/testdir/dumps/Test_xxd_color_0.dump b/src/testdir/dumps/Test_xxd_color_0.dump index 0b3b5fc16..73cbe6b69 100644 --- a/src/testdir/dumps/Test_xxd_color_0.dump +++ b/src/testdir/dumps/Test_xxd_color_0.dump @@ -1,5 +1,4 @@ -|$+0&#ffffff0| |.@1|/|x@1|d|/|x@1|d| |-|R| |n|e|v|e|r| @1|<| |X@1|D|f|i|l|e|_|c|o|l|o|r|s| @35 -|0@7|:| |0@2|1| |0|2|0|3| |0|4|0|5| |0|6|0|7| |0|8|0|9| |0|a|0|b| |0|c|0|d| |0|e|0|f| @1|.@15| @7 +|$+0&#ffffff0| |0@7|:| |0@2|1| |0|2|0|3| |0|4|0|5| |0|6|0|7| |0|8|0|9| |0|a|0|b| |0|c|0|d| |0|e|0|f| @1|.@15| @7 |0@5|1|0|:| |1|0|1@1| |1|2|1|3| |1|4|1|5| |1|6|1|7| |1|8|1|9| |1|a|1|b| |1|c|1|d| |1|e|1|f| @1|.@15| @7 |0@5|2|0|:| |2|0|2|1| |2@2|3| |2|4|2|5| |2|6|0@1| |2|8|2|9| |2|a|2|b| |2|c|2|d| |2|e|2|f| @2|!|"|#|$|%|&|.|(|)|*|+|,|-|.|/| @7 |0@5|3|0|:| |3|0|3|1| |3|2|3@1| |3|4|3|5| |3|6|3|7| |3|8|3|9| |3|a|3|b| |3|c|3|d| |3|e|3|f| @1|0|1|2|3|4|5|6|7|8|9|:|;|<|=|>|?| @7 diff --git a/src/testdir/dumps/Test_xxd_color_0.vim b/src/testdir/dumps/Test_xxd_color_0.vim new file mode 100644 index 000000000..7ac1f2647 --- /dev/null +++ b/src/testdir/dumps/Test_xxd_color_0.vim @@ -0,0 +1,2 @@ +" Filter that removes the Shell Prompt from the xxd command +:1s#|\$+0&\#ffffff0| \S\+/|x@1|d|.*\n#|$+0\&\#ffffff0| #e diff --git a/src/version.c b/src/version.c index affc9d74e..9a7a53603 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 711, /**/ 710, /**/