patch 9.1.1837: tests: Test_plugin_evaluate_in_popup() fails on 32bit

Problem:  tests: Test_plugin_evaluate_in_popup() fails on 32bit arch
          (James McCoy)
Solution: Instead of evaluating the ptr, let's evaluate just the pointer
          content, skipping printing the pointer address.

fixes: #18499
closes: #18503

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

diff --git a/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.dump b/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.dump
index 0e3fa333990883c33acb79c662c554e230128809..5905e0cce2a3208d1d2476462db96a4499fcce84 100644 (file)
--- a/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.dump
+++ b/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.dump
@@ -1,6 +1,6 @@
 |U+0&#ffffff0|s|i|n|g| |h|o|s|t| |l|i|b|t|h|r|e|a|d|_|d|b| |l|i|b|r|a|r|y| |"|/+0#00e0003&|l|i|b|/|x|8|6|_|6|4|-|l|i|n|u|x|-|g|n|u|/|l|i|b|t|h|r|e|a|d|_|d|b|.|s|o|.|1|"+0#0000000&|.| 
 @75
-|B|r|e|a|k|p|o|i|n|t| |1|,| |m+0#e0e0004&|a|i|n| +0#0000000&|(|a+0#00e0e07&|r|g|c|=+0#0000000&|1|,| |a+0#00e0e07&|r|g|v|=+0#0000000&|0|x|7|f@6|d|e|f|8|)| @26
+|B|r|e|a|k|p|o|i|n|t| |1|,| |m+0#e0e0004&|a|i|n| +0#0000000&|(|a+0#00e0e07&|r|g|c|=+0#0000000&|1|,| |a+0#00e0e07&|r|g|v|=+0#0000000&|0|x|7|f@6|d|e|7|8|)| @26
 @4|a|t| |X+0#00e0003&|T|D|_|e|v|a|l|u|a|t|e|_|i|n|_|p|o|p|u|p|.|c|:+0#0000000&|9| @42
 |9| @8|r+2#0000e05&|e|t|u|r|n| +0#0000000&|0+0#e000e06&|;+0#e000002&| +0#0000000&@55
 @75
@@ -10,11 +10,11 @@
 @75
 @75
 @75
-|d+0#ffffff16#00e0003|e|b|u|p+0#0000001#ffd7ff255|_|p|t|r|:| |0|x|7|f@6|d@1|c|0| |=| |{| +0#ffffff16#00e0003@27|0|,|0|-|1| @9|A|l@1
-| +0#0000000#e0e0e08| +2#ffffff16#6c6c6c255|S|t| +0#0000001#ffd7ff255@1|x| |=| |1|,| @16|o+2#ffffff16#6c6c6c255|n|t| | +0#0000000#e0e0e08@1| +2#ffffff16#6c6c6c255|S|t|o|p| | +0#0000000#e0e0e08@1| +2#ffffff16#6c6c6c255|E|v|a|l| | +0#0000000#e0e0e08@25
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1| +0#0000001#ffd7ff255@1|y| |=| |2| @17|}+0#0000000#ffffff0|;| @43
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|}+0#0000001#ffd7ff255| @23| +0#0000000#ffffff0@45
+|d+0#ffffff16#00e0003|e|b|u|*+0#0000001#ffd7ff255|p|_|p|t|r|:| |{|r+0#ffffff16#00e0003|a|m| |[|a|c|t|i|v|e|]| @31|0|,|0|-|1| @9|A|l@1
+| +0#0000000#e0e0e08| +2#ffffff16#6c6c6c255|S|t| +0#0000001#ffd7ff255@1|x| |=| |1|,| |t+2#ffffff16#6c6c6c255| | +0#0000000#e0e0e08@1| +2#ffffff16#6c6c6c255|F|i|n|i|s|h| | +0#0000000#e0e0e08@1| +2#ffffff16#6c6c6c255|C|o|n|t| | +0#0000000#e0e0e08@1| +2#ffffff16#6c6c6c255|S|t|o|p| | +0#0000000#e0e0e08@1| +2#ffffff16#6c6c6c255|E|v|a|l| | +0#0000000#e0e0e08@25
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1| +0#0000001#ffd7ff255@1|y| |=| |2| @1|i+0#0000000#ffffff0|n|t| |p| |=| |{|a|r|g|c|,| |2+0#e000002&|}+0#0000000&|;| @43
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|}+0#0000001#ffd7ff255| @7|i+0#0000000#ffffff0|n|t|*| |p|_|p|t|r| |=| |&|p|;| @45
 |0+0&#ff404010|1| +0&#5fd7ff255@1>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&|;+0#0000000&| @61
 | +0#0000e05#a8a8a8255@1|}+0#0000000#ffffff0| @71
 |X+3&&|T|D|_|e|v|a|l|u|a|t|e|_|i|n|_|p|o|p|u|p|.|c| @33|9|,|3| @11|B|o|t
-|:+0&&|E|v|a|l|u|a|t|e| |p|_|p|t|r| @59
+|:+0&&|E|v|a|l|u|a|t|e| |*|p|_|p|t|r| @58

diff --git a/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.vim b/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.vim
index 959798ac41b41d81e8a4252992dccf305fb5dafe..9b38dc4dea9df15e372e9e142bff86103825e6f3 100644 (file)
--- a/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.vim
+++ b/src/testdir/dumps/Test_termdebug_evaluate_in_popup_02.vim
@@ -1,6 +1,3 @@
-" replace hex addresses with |0|x|f@12|
-:%s/|0|x|\(\(\w\|@\)\+|\)\+/|0|x|f@12|/g
-
 " Only keep screen lines relevant to the actual popup and evaluation.
 " Especially the top lines are too instable and cause flakiness between
 " different systems and tool versions.

diff --git a/src/testdir/test_plugin_termdebug.vim b/src/testdir/test_plugin_termdebug.vim
index 9fec8f882fd6961aebf80b74c6757be44eef4496..79455ba08833e67a7fbe1ac2046e7a5edf57c4c7 100644 (file)
--- a/src/testdir/test_plugin_termdebug.vim
+++ b/src/testdir/test_plugin_termdebug.vim
@@ -351,7 +351,7 @@ func Test_termdebug_evaluate_in_popup()
   call TermWait(buf, 400)
   call VerifyScreenDump(buf, 'Test_termdebug_evaluate_in_popup_01', {})
 
-  call term_sendkeys(buf, ":Evaluate p_ptr\<CR>")
+  call term_sendkeys(buf, ":Evaluate *p_ptr\<CR>")
   call TermWait(buf, 400)
   call VerifyScreenDump(buf, 'Test_termdebug_evaluate_in_popup_02', {})
 

diff --git a/src/version.c b/src/version.c
index c716d7f1f8a886af4931329e8304746142beb6ba..36e55289664cf2af99adf9c61775be18c216815e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1837,
 /**/
     1836,
 /**/