summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-07-10 20:43:59 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-10 20:43:59 +0200
commit31e21766d6fb0a386e15ccc8c2192f6a3a210f53 (patch)
tree71e7d9773461b533414a2243ce76ded3ec3c371e
parentc323527d67081cfaff22503d1d282495976c7042 (diff)
patch 8.2.3138: debugger test failsv8.2.3138
Problem: Debugger test fails. Solution: Adjust eval command.
-rw-r--r--src/testdir/test_debugger.vim14
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 7 deletions
diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim
index 5b12c58778..2937d54604 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 762f3f809a..4c88268926 100644
--- 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,