changeset 25204:bc1633df8a88 v8.2.3138

patch 8.2.3138: debugger test fails Commit: https://github.com/vim/vim/commit/31e21766d6fb0a386e15ccc8c2192f6a3a210f53 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 10 20:43:59 2021 +0200 patch 8.2.3138: debugger test fails Problem: Debugger test fails. Solution: Adjust eval command.
author Bram Moolenaar <Bram@vim.org>
date Sat, 10 Jul 2021 20:45:03 +0200
parents 3f580ebab45b
children 362cabc968e8
files src/testdir/test_debugger.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_debugger.vim
+++ b/src/testdir/test_debugger.vim
@@ -1006,7 +1006,7 @@ func Test_debug_def_function()
          }
          # comment
          def Inner()
-           eval 1
+           eval 1 + 2
          enddef
     enddef
 
@@ -1019,16 +1019,16 @@ func Test_debug_def_function()
     enddef
 
     def g:FuncForLoop()
-      eval 1
+      eval 1 + 2
       for i in [11, 22, 33]
-        eval i
+        eval i + 2
       endfor
       echo "done"
     enddef
 
     def g:FuncWithSplitLine()
-        eval 1
-           | eval 2
+        eval 1 + 2
+           | eval 2 + 3
     enddef
   END
   call writefile(file, 'Xtest.vim')
@@ -1080,7 +1080,7 @@ func Test_debug_def_function()
   call RunDbgCmd(buf, ':breakadd func 2 FuncForLoop')
   call RunDbgCmd(buf, ':call FuncForLoop()', ['function FuncForLoop', 'line 2: for i in [11, 22, 33]'])
   call RunDbgCmd(buf, 'echo i', ['11'])
-  call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 3: eval i'])
+  call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 3: eval i + 2'])
   call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 4: endfor'])
   call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 2: for i in [11, 22, 33]'])
   call RunDbgCmd(buf, 'echo i', ['22'])
@@ -1089,7 +1089,7 @@ func Test_debug_def_function()
   call RunDbgCmd(buf, 'cont')
 
   call RunDbgCmd(buf, ':breakadd func FuncWithSplitLine')
-  call RunDbgCmd(buf, ':call FuncWithSplitLine()', ['function FuncWithSplitLine', 'line 1: eval 1 | eval 2'])
+  call RunDbgCmd(buf, ':call FuncWithSplitLine()', ['function FuncWithSplitLine', 'line 1: eval 1 + 2 | eval 2 + 3'])
 
   call RunDbgCmd(buf, 'cont')
   call StopVimInTerminal(buf)
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3138,
+/**/
     3137,
 /**/
     3136,