Skip to content

Commit

Permalink
patch 8.1.1461: tests do not run or are not reliable on some systems
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
brammool committed Jun 3, 2019
1 parent 02e1507 commit ddd3308
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 10 deletions.
16 changes: 8 additions & 8 deletions src/testdir/test_debugger.vim
Expand Up @@ -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', [
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/test_environ.vim
Expand Up @@ -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=')

This comment has been minimized.

Copy link
@k-takata

k-takata Jun 4, 2019

Member

^ is a special character on cmd.exe, so it should be quoted by "" or ^:

--- 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 | findstr ^FOO=')
+    let result = system('set | findstr "^FOO="')
   else
     let result = system('env | grep ^FOO=')
   endif

This comment has been minimized.

Copy link
@brammool

brammool via email Jun 4, 2019

Author Contributor

This comment has been minimized.

Copy link
@k-takata

k-takata Jun 4, 2019

Member

The test may fail if someone sets an environment variable like xFOO.

else
let result = system('env | grep ^FOO=')
endif
Expand Down
6 changes: 5 additions & 1 deletion src/testdir/test_filetype.vim
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/testdir/test_source.vim
Expand Up @@ -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
1 change: 1 addition & 0 deletions src/testdir/test_terminal.vim
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -767,6 +767,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1461,
/**/
1460,
/**/
Expand Down

0 comments on commit ddd3308

Please sign in to comment.