1
0
forked from aniani/vim

patch 8.1.1634: terminal test fails when term_getansicolors() is missing

Problem:    Terminal test fails when term_getansicolors() is missing.
            Diff test fails without +rightleft.  (Dominique Pelle)
Solution:   Check if term_getansicolors() is supported. (closes #4597)
This commit is contained in:
Bram Moolenaar
2019-07-04 22:32:39 +02:00
parent b7ed839976
commit 981d9dc8f3
3 changed files with 14 additions and 0 deletions

View File

@@ -909,6 +909,9 @@ func Test_diff_of_diff()
if !CanRunVimInTerminal()
throw 'Skipped: cannot run Vim in a terminal window'
endif
if !has("rightleft")
throw 'Skipped: rightleft not supported'
endif
call writefile([
\ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])',

View File

@@ -1434,6 +1434,9 @@ func Test_terminal_api_call_fail_delete()
endfunc
func Test_terminal_ansicolors_default()
if !exists('*term_getansicolors')
throw 'Skipped: term_getansicolors() not supported'
endif
let colors = [
\ '#000000', '#e00000',
\ '#00e000', '#e0e000',
@@ -1465,6 +1468,9 @@ let s:test_colors = [
\]
func Test_terminal_ansicolors_global()
if !exists('*term_getansicolors')
throw 'Skipped: term_getansicolors() not supported'
endif
let g:terminal_ansi_colors = reverse(copy(s:test_colors))
let buf = Run_shell_in_terminal({})
call assert_equal(g:terminal_ansi_colors, term_getansicolors(buf))
@@ -1476,6 +1482,9 @@ func Test_terminal_ansicolors_global()
endfunc
func Test_terminal_ansicolors_func()
if !exists('*term_getansicolors')
throw 'Skipped: term_getansicolors() not supported'
endif
let g:terminal_ansi_colors = reverse(copy(s:test_colors))
let buf = Run_shell_in_terminal({'ansi_colors': s:test_colors})
call assert_equal(s:test_colors, term_getansicolors(buf))

View File

@@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1634,
/**/
1633,
/**/