From: Bram Moolenaar Date: Sat, 10 Jul 2021 18:43:59 +0000 (+0200) Subject: patch 8.2.3138: debugger test fails X-Git-Tag: v8.2.3138 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31e21766d6fb0a386e15ccc8c2192f6a3a210f53;p=vim patch 8.2.3138: debugger test fails Problem: Debugger test fails. Solution: Adjust eval command. --- diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim index 5b12c5877..2937d5460 100644 --- 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) diff --git a/src/version.c b/src/version.c index 762f3f809..4c8826892 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3138, /**/ 3137, /**/