forked from aniani/vim
patch 8.1.1461: tests do not run or are not reliable on some systems
Problem: Tests do not run or are not reliable on some systems. Solution: Use "findstr" instead of "grep" on MS-Windows. Clear PROMPT_COMMAND in the terminal test. Delete temp file. Wait for output after executing a debug command. (Yegappan Lakshmanan, closes #4479)
This commit is contained in:
@@ -52,16 +52,16 @@ func Test_Debugger()
|
|||||||
let buf = RunVimInTerminal('-S Xtest.vim', {})
|
let buf = RunVimInTerminal('-S Xtest.vim', {})
|
||||||
|
|
||||||
" Start the Vim debugger
|
" 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
|
" Create a few stack frames by stepping through functions
|
||||||
call RunDbgCmd(buf, 'step')
|
call RunDbgCmd(buf, 'step', ['line 1: let var1 = 1'])
|
||||||
call RunDbgCmd(buf, 'step')
|
call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bar(var1) + 9'])
|
||||||
call RunDbgCmd(buf, 'step')
|
call RunDbgCmd(buf, 'step', ['line 1: let var1 = 2 + a:var'])
|
||||||
call RunDbgCmd(buf, 'step')
|
call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bazz(var1) + 4'])
|
||||||
call RunDbgCmd(buf, 'step')
|
call RunDbgCmd(buf, 'step', ['line 1: try'])
|
||||||
call RunDbgCmd(buf, 'step')
|
call RunDbgCmd(buf, 'step', ['line 2: let var1 = 3 + a:var'])
|
||||||
call RunDbgCmd(buf, 'step')
|
call RunDbgCmd(buf, 'step', ['line 3: let var3 = "another var"'])
|
||||||
|
|
||||||
" check backtrace
|
" check backtrace
|
||||||
call RunDbgCmd(buf, 'backtrace', [
|
call RunDbgCmd(buf, 'backtrace', [
|
||||||
|
@@ -36,7 +36,7 @@ func Test_external_env()
|
|||||||
|
|
||||||
call setenv('FOO', v:null)
|
call setenv('FOO', v:null)
|
||||||
if has('win32')
|
if has('win32')
|
||||||
let result = system('set | grep ^FOO=')
|
let result = system('set | findstr ^FOO=')
|
||||||
else
|
else
|
||||||
let result = system('env | grep ^FOO=')
|
let result = system('env | grep ^FOO=')
|
||||||
endif
|
endif
|
||||||
|
@@ -520,7 +520,11 @@ func CheckItems(checks)
|
|||||||
catch
|
catch
|
||||||
call assert_report('cannot edit "' . names[i] . '": ' . v:errmsg)
|
call assert_report('cannot edit "' . names[i] . '": ' . v:errmsg)
|
||||||
endtry
|
endtry
|
||||||
|
if &filetype == '' && &readonly
|
||||||
|
" File exists but not able to edit it (permission denied)
|
||||||
|
else
|
||||||
call assert_equal(ft, &filetype, 'with file name: ' . names[i])
|
call assert_equal(ft, &filetype, 'with file name: ' . names[i])
|
||||||
|
endif
|
||||||
bwipe!
|
bwipe!
|
||||||
endfor
|
endfor
|
||||||
endfor
|
endfor
|
||||||
|
@@ -44,4 +44,5 @@ func Test_source_sandbox()
|
|||||||
call assert_equal('hello', getline(1))
|
call assert_equal('hello', getline(1))
|
||||||
call assert_fails('sandbox source! Xsourcehello', 'E48:')
|
call assert_fails('sandbox source! Xsourcehello', 'E48:')
|
||||||
bwipe!
|
bwipe!
|
||||||
|
call delete('Xsourcehello')
|
||||||
endfunc
|
endfunc
|
||||||
|
@@ -8,6 +8,7 @@ source shared.vim
|
|||||||
source screendump.vim
|
source screendump.vim
|
||||||
|
|
||||||
let s:python = PythonProg()
|
let s:python = PythonProg()
|
||||||
|
let $PROMPT_COMMAND=''
|
||||||
|
|
||||||
" Open a terminal with a shell, assign the job to g:job and return the buffer
|
" Open a terminal with a shell, assign the job to g:job and return the buffer
|
||||||
" number.
|
" number.
|
||||||
|
@@ -767,6 +767,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1461,
|
||||||
/**/
|
/**/
|
||||||
1460,
|
1460,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user