diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-06-25 17:52:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-25 17:52:39 +0200 |
| commit | 9f592780b5bb8c69e18784c440c711dc5a4684e2 (patch) | |
| tree | 34c4abe44693550d88221cbd140828d2657dcd7a /test/functional/ex_cmds | |
| parent | b7084fef4c850d0352488b14dcff0f36a7e75e1c (diff) | |
| parent | f977f9445f7689fc32a136108ff92b3c2137968c (diff) | |
| download | rneovim-9f592780b5bb8c69e18784c440c711dc5a4684e2.tar.gz rneovim-9f592780b5bb8c69e18784c440c711dc5a4684e2.tar.bz2 rneovim-9f592780b5bb8c69e18784c440c711dc5a4684e2.zip | |
Merge pull request #16271 from 3N4N/fix-15913
fix: make_filter_cmd for powershell as shell
Diffstat (limited to 'test/functional/ex_cmds')
| -rw-r--r-- | test/functional/ex_cmds/ls_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/ex_cmds/make_spec.lua | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/ex_cmds/ls_spec.lua b/test/functional/ex_cmds/ls_spec.lua index 9853084c47..2583d80269 100644 --- a/test/functional/ex_cmds/ls_spec.lua +++ b/test/functional/ex_cmds/ls_spec.lua @@ -5,7 +5,7 @@ local eq = helpers.eq local eval = helpers.eval local feed = helpers.feed local nvim = helpers.nvim -local nvim_dir = helpers.nvim_dir +local testprg = helpers.testprg local retry = helpers.retry describe(':ls', function() @@ -14,7 +14,7 @@ describe(':ls', function() end) it('R, F for :terminal buffers', function() - nvim('set_option', 'shell', string.format('"%s" INTERACT', nvim_dir..'/shell-test')) + nvim('set_option', 'shell', string.format('"%s" INTERACT', testprg('shell-test'))) command('edit foo') command('set hidden') diff --git a/test/functional/ex_cmds/make_spec.lua b/test/functional/ex_cmds/make_spec.lua index 3b4d22ab38..bf585ee44c 100644 --- a/test/functional/ex_cmds/make_spec.lua +++ b/test/functional/ex_cmds/make_spec.lua @@ -4,7 +4,7 @@ local eval = helpers.eval local has_powershell = helpers.has_powershell local matches = helpers.matches local nvim = helpers.nvim -local nvim_dir = helpers.nvim_dir +local testprg = helpers.testprg describe(':make', function() clear() @@ -22,7 +22,7 @@ describe(':make', function() end) it('captures stderr & non zero exit code #14349', function () - nvim('set_option', 'makeprg', nvim_dir..'/shell-test foo') + nvim('set_option', 'makeprg', testprg('shell-test')..' foo') local out = eval('execute("make")') -- Make program exit code correctly captured matches('\nshell returned 3', out) @@ -31,7 +31,7 @@ describe(':make', function() end) it('captures stderr & zero exit code #14349', function () - nvim('set_option', 'makeprg', nvim_dir..'/shell-test') + nvim('set_option', 'makeprg', testprg('shell-test')) local out = eval('execute("make")') -- Ensure there are no "shell returned X" messages between -- command and last line (indicating zero exit) |