Merge pull request #29103 from gpanders/test-no-tgc

test: do not set termguicolors in test runner
This commit is contained in:
Gregory Anders 2024-06-12 19:31:15 -05:00 committed by GitHub
commit 6311a7fe4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 13 deletions

View File

@ -4388,8 +4388,9 @@ vim.text.hexdecode({enc}) *vim.text.hexdecode()*
Parameters: ~
• {enc} (`string`) String to decode
Return: ~
(`string`) Decoded string
Return (multiple): ~
(`string?`) Decoded string
(`string?`) Error message, if any
vim.text.hexencode({str}) *vim.text.hexencode()*
Hex encode a string.

View File

@ -18,15 +18,19 @@ end
--- Hex decode a string.
---
--- @param enc string String to decode
--- @return string : Decoded string
--- @return string? : Decoded string
--- @return string? : Error message, if any
function M.hexdecode(enc)
assert(#enc % 2 == 0, 'string must have an even number of hex characters')
if #enc % 2 ~= 0 then
return nil, 'string must have an even number of hex characters'
end
local str = {} ---@type string[]
for i = 1, #enc, 2 do
local n = assert(tonumber(enc:sub(i, i + 1), 16))
str[#str + 1] = string.char(n)
end
return table.concat(str)
return table.concat(str), nil
end
return M

View File

@ -400,9 +400,6 @@ describe('startup', function()
read_file('Xtest_startup_ttyout')
)
end)
if is_os('win') then
assert_log('stream write failed. RPC canceled; closing channel', testlog)
end
end)
it('input from pipe: has("ttyin")==0 has("ttyout")==1', function()
@ -435,9 +432,6 @@ describe('startup', function()
read_file('Xtest_startup_ttyout')
)
end)
if is_os('win') then
assert_log('stream write failed. RPC canceled; closing channel', testlog)
end
end)
it('input from pipe (implicit) #7679', function()

View File

@ -22,7 +22,7 @@ local runtime_set = 'set runtimepath^=./build/lib/nvim/'
M.nvim_prog = (os.getenv('NVIM_PRG') or t.paths.test_build_dir .. '/bin/nvim')
-- Default settings for the test session.
M.nvim_set = (
'set shortmess+=IS background=light termguicolors noswapfile noautoindent startofline'
'set shortmess+=IS background=light noswapfile noautoindent startofline'
.. ' laststatus=1 undodir=. directory=. viewdir=. backupdir=.'
.. ' belloff= wildoptions-=pum joinspaces noshowcmd noruler nomore redrawdebug=invalid'
)

View File

@ -1129,7 +1129,7 @@ describe("builtin popupmenu 'pumblend'", function()
[10] = { foreground = tonumber('0x000002') },
})
screen:attach({ rgb = false })
command('set notermguicolors pumblend=10')
command('set pumblend=10')
insert([[
Lorem ipsum dolor sit amet, consectetur
adipisicing elit, sed do eiusmod tempor