diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/ex_cmds/make_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/helpers.lua | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/functional/ex_cmds/make_spec.lua b/test/functional/ex_cmds/make_spec.lua index f42e21e4cb..8d903330b1 100644 --- a/test/functional/ex_cmds/make_spec.lua +++ b/test/functional/ex_cmds/make_spec.lua @@ -24,10 +24,8 @@ describe(':make', function() it('captures stderr & non zero exit code #14349', function () nvim('set_option', 'makeprg', testprg('shell-test')..' foo') local out = eval('execute("make")') - -- Make program exit code correctly captured - matches('\nshell returned 3', out) -- Error message is captured in the file and printed in the footer - matches('\n.*%: Unknown first argument%: foo', out) + matches('[\r\n]+.*[\r\n]+Unknown first argument%: foo[\r\n]+%(1 of 1%)%: Unknown first argument%: foo', out) end) it('captures stderr & zero exit code #14349', function () diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index 2e373467d0..6e668b22b0 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -552,7 +552,7 @@ function module.set_shell_powershell(fake) end local shell = found and (is_os('win') and 'powershell' or 'pwsh') or module.testprg('pwsh-test') local cmd = 'Remove-Item -Force '..table.concat(is_os('win') - and {'alias:cat', 'alias:echo', 'alias:sleep', 'alias:sort'} + and {'alias:cat', 'alias:echo', 'alias:sleep', 'alias:sort', 'alias:tee'} or {'alias:echo'}, ',')..';' module.exec([[ let &shell = ']]..shell..[[' @@ -562,7 +562,7 @@ function module.set_shell_powershell(fake) let &shellcmdflag .= '$PSDefaultParameterValues[''Out-File:Encoding'']=''utf8'';' let &shellcmdflag .= ']]..cmd..[[' let &shellredir = '2>&1 | %%{ "$_" } | Out-File %s; exit $LastExitCode' - let &shellpipe = '2>&1 | %%{ "$_" } | Tee-Object %s; exit $LastExitCode' + let &shellpipe = '2>&1 | %%{ "$_" } | tee %s; exit $LastExitCode' ]]) return found end |