diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-01-02 17:28:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-02 17:28:57 +0000 |
| commit | 3d0da09bb2d31afc611bf1c4b35796739d87ed63 (patch) | |
| tree | 9f0d47a106831484fbcc3b2f9ce294b80152a727 | |
| parent | eaaac014a01ce37c1f86dbda054c01a5c6f034e7 (diff) | |
patch 8.2.3984: debugger test failsv8.2.3984
Problem: Debugger test fails.
Solution: Adjust the test for modified debugging of a for loop.
| -rw-r--r-- | src/testdir/test_debugger.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim index e305033ebb..659c7a81d5 100644 --- a/src/testdir/test_debugger.vim +++ b/src/testdir/test_debugger.vim @@ -1120,18 +1120,21 @@ func Test_debug_def_function() call RunDbgCmd(buf, 'echo text', ['asdf']) call RunDbgCmd(buf, 'echo nr', ['42']) call RunDbgCmd(buf, 'echo items', ['[1, 2, 3]']) - call RunDbgCmd(buf, 'step', ['asdf42', 'function FuncWithArgs', 'line 2: for it in items']) - call RunDbgCmd(buf, 'echo it', ['1']) + call RunDbgCmd(buf, 'step', ['asdf42', 'function FuncWithArgs', 'line 2: for it in items']) + call RunDbgCmd(buf, 'step', ['function FuncWithArgs', 'line 2: for it in items']) + call RunDbgCmd(buf, 'echo it', ['0']) call RunDbgCmd(buf, 'step', ['line 3: echo it']) + call RunDbgCmd(buf, 'echo it', ['1']) call RunDbgCmd(buf, 'step', ['1', 'function FuncWithArgs', 'line 4: endfor']) call RunDbgCmd(buf, 'step', ['line 2: for it in items']) - call RunDbgCmd(buf, 'echo it', ['2']) + call RunDbgCmd(buf, 'echo it', ['1']) call RunDbgCmd(buf, 'step', ['line 3: echo it']) call RunDbgCmd(buf, 'step', ['2', 'function FuncWithArgs', 'line 4: endfor']) call RunDbgCmd(buf, 'step', ['line 2: for it in items']) - call RunDbgCmd(buf, 'echo it', ['3']) + call RunDbgCmd(buf, 'echo it', ['2']) call RunDbgCmd(buf, 'step', ['line 3: echo it']) call RunDbgCmd(buf, 'step', ['3', 'function FuncWithArgs', 'line 4: endfor']) + call RunDbgCmd(buf, 'step', ['line 2: for it in items']) call RunDbgCmd(buf, 'step', ['line 5: echo "done"']) call RunDbgCmd(buf, 'cont') @@ -1149,11 +1152,13 @@ func Test_debug_def_function() call RunDbgCmd(buf, 'cont') 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, ':call FuncForLoop()', ['function FuncForLoop', 'line 2: for i in [11, 22, 33]']) + call RunDbgCmd(buf, 'step', ['line 2: for i in [11, 22, 33]']) call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 3: eval i + 2']) + call RunDbgCmd(buf, 'echo i', ['11']) 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, 'next', ['line 3: eval i + 2']) call RunDbgCmd(buf, 'echo i', ['22']) call RunDbgCmd(buf, 'breakdel *') diff --git a/src/version.c b/src/version.c index 77c6f129e2..597913f56a 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3984, +/**/ 3983, /**/ 3982, |