diff options
| -rw-r--r-- | src/nvim/testdir/test_debugger.vim | 16 | ||||
| -rw-r--r-- | src/nvim/testdir/test_environ.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_source.vim | 19 |
4 files changed, 24 insertions, 19 deletions
diff --git a/src/nvim/testdir/test_debugger.vim b/src/nvim/testdir/test_debugger.vim index c923b22836..bb87ef9c58 100644 --- a/src/nvim/testdir/test_debugger.vim +++ b/src/nvim/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/nvim/testdir/test_environ.vim b/src/nvim/testdir/test_environ.vim index 094c4ce36f..21bb09a690 100644 --- a/src/nvim/testdir/test_environ.vim +++ b/src/nvim/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/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index e6d4933797..a9ade9155a 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -522,7 +522,11 @@ func CheckItems(checks) catch call assert_report('cannot edit "' . names[i] . '": ' . v:exception) 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/nvim/testdir/test_source.vim b/src/nvim/testdir/test_source.vim index 697b552df4..09baec0b7d 100644 --- a/src/nvim/testdir/test_source.vim +++ b/src/nvim/testdir/test_source.vim @@ -1,14 +1,5 @@ " Tests for the :source command. -func Test_source_sandbox() - new - call writefile(["Ohello\<Esc>"], 'Xsourcehello') - source! Xsourcehello | echo - call assert_equal('hello', getline(1)) - call assert_fails('sandbox source! Xsourcehello', 'E48:') - bwipe! -endfunc - func Test_source_autocmd() call writefile([ \ 'let did_source = 1', @@ -45,3 +36,13 @@ func Test_source_cmd() au! SourcePre au! SourcePost endfunc + +func Test_source_sandbox() + new + call writefile(["Ohello\<Esc>"], 'Xsourcehello') + source! Xsourcehello | echo + call assert_equal('hello', getline(1)) + call assert_fails('sandbox source! Xsourcehello', 'E48:') + bwipe! + call delete('Xsourcehello') +endfunc |