diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_debugger.vim | 16 | ||||
| -rw-r--r-- | src/testdir/test_environ.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 6 | ||||
| -rw-r--r-- | src/testdir/test_source.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 18 insertions, 10 deletions
diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim index 8faf7ac06..4c3d6721f 100644 --- a/src/testdir/test_debugger.vim +++ b/src/testdir/test_debugger.vim @@ -52,16 +52,16 @@ func Test_Debugger() let buf = RunVimInTerminal('-S Xtest.vim', {}) " Start the Vim debugger - call RunDbgCmd(buf, ':debug echo Foo()') + call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()']) " Create a few stack frames by stepping through functions - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') - call RunDbgCmd(buf, 'step') + call RunDbgCmd(buf, 'step', ['line 1: let var1 = 1']) + call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bar(var1) + 9']) + call RunDbgCmd(buf, 'step', ['line 1: let var1 = 2 + a:var']) + call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bazz(var1) + 4']) + call RunDbgCmd(buf, 'step', ['line 1: try']) + call RunDbgCmd(buf, 'step', ['line 2: let var1 = 3 + a:var']) + call RunDbgCmd(buf, 'step', ['line 3: let var3 = "another var"']) " check backtrace call RunDbgCmd(buf, 'backtrace', [ diff --git a/src/testdir/test_environ.vim b/src/testdir/test_environ.vim index 094c4ce36..76ffe5631 100644 --- a/src/testdir/test_environ.vim +++ b/src/testdir/test_environ.vim @@ -36,7 +36,7 @@ func Test_external_env() call setenv('FOO', v:null) if has('win32') - let result = system('set | grep ^FOO=') + let result = system('set | findstr ^FOO=') else let result = system('env | grep ^FOO=') endif diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index cb55e28b6..95fb62e71 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -520,7 +520,11 @@ func CheckItems(checks) catch call assert_report('cannot edit "' . names[i] . '": ' . v:errmsg) endtry - call assert_equal(ft, &filetype, 'with file name: ' . names[i]) + if &filetype == '' && &readonly + " File exists but not able to edit it (permission denied) + else + call assert_equal(ft, &filetype, 'with file name: ' . names[i]) + endif bwipe! endfor endfor diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim index 5166bafb1..09baec0b7 100644 --- a/src/testdir/test_source.vim +++ b/src/testdir/test_source.vim @@ -44,4 +44,5 @@ func Test_source_sandbox() call assert_equal('hello', getline(1)) call assert_fails('sandbox source! Xsourcehello', 'E48:') bwipe! + call delete('Xsourcehello') endfunc diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index b97cdb310..9d6fddd01 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -8,6 +8,7 @@ source shared.vim source screendump.vim let s:python = PythonProg() +let $PROMPT_COMMAND='' " Open a terminal with a shell, assign the job to g:job and return the buffer " number. diff --git a/src/version.c b/src/version.c index eeaa5efc8..a7f77faf0 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1461, +/**/ 1460, /**/ 1459, |