aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-08-28 21:25:34 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-08-30 21:12:25 -0400
commit40fca0cea8d6db8eb93059d1375630012382e465 (patch)
tree9948fc61843e5e3bc74180a4a4d74a2f671d9128
parent61218d3c776b798a076accc6cf85e48e5dafa76a (diff)
downloadrneovim-40fca0cea8d6db8eb93059d1375630012382e465.tar.gz
rneovim-40fca0cea8d6db8eb93059d1375630012382e465.tar.bz2
rneovim-40fca0cea8d6db8eb93059d1375630012382e465.zip
vim-patch:8.2.1315: MS-Windows: test log contains escape sequences
Problem: MS-Windows: test log contains escape sequences. Solution: Do not use t_md and t_me but ANSI escape sequences. (Ken Takata, closes vim/vim#6559) https://github.com/vim/vim/commit/45df2a01a79d562b59949383f79625bb8bd89a69
-rw-r--r--src/nvim/testdir/runtest.vim10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 1e7022db65..765ba2cbb6 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -101,6 +101,8 @@ let &runtimepath .= ','.expand($BUILD_DIR).'/runtime/'
" Always use forward slashes.
set shellslash
+let s:t_bold = &t_md
+let s:t_normal = &t_me
if has('win32')
" avoid prompt that is long or contains a line break
let $PROMPT = '$P$G'
@@ -212,11 +214,11 @@ func RunTheTest(test)
let message ..= repeat(' ', 50 - len(message))
let time = reltime(func_start)
if has('float') && reltimefloat(time) > 0.1
- let message = &t_md .. message
+ let message = s:t_bold .. message
endif
let message ..= ' in ' .. reltimestr(time) .. ' seconds'
if has('float') && reltimefloat(time) > 0.1
- let message ..= &t_me
+ let message ..= s:t_normal
endif
endif
call add(s:messages, message)
@@ -285,9 +287,9 @@ func FinishTesting()
let message = 'Executed ' . s:done . (s:done > 1 ? ' tests' : ' test')
endif
if s:done > 0 && has('reltime')
- let message = &t_md .. message .. repeat(' ', 40 - len(message))
+ let message = s:t_bold .. message .. repeat(' ', 40 - len(message))
let message ..= ' in ' .. reltimestr(reltime(s:start_time)) .. ' seconds'
- let message ..= &t_me
+ let message ..= s:t_normal
endif
echo message
call add(s:messages, message)