IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2075 from jszakmeister/dont-hardcode-tty-test-path

Browse Source 
tests: don't hardcode the path to tty-test
This commit is contained in:
John Szakmeister 2015-03-01 15:24:00 -05:00
commit ea35062589
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/functional/helpers.lua
View File

@ -9,6 +9,15 @@ local nvim_prog = os.getenv('NVIM_PROG') or 'build/bin/nvim'
local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N', local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N',
'--cmd', 'set shortmess+=I background=light noswapfile', '--cmd', 'set shortmess+=I background=light noswapfile',
'--embed'} '--embed'}
-- Formulate a path to the directory containing nvim. We use this to
-- help run test executables. It helps to keep the tests working, even
-- when the build is not in the default location.
local nvim_dir = nvim_prog:gsub("[/\\][^/\\]+$", "")
if nvim_dir == nvim_prog then
nvim_dir = "."
end
local prepend_argv local prepend_argv
if os.getenv('VALGRIND') then if os.getenv('VALGRIND') then
@ -283,6 +292,7 @@ return {
expect = expect, expect = expect,
ok = ok, ok = ok,
nvim = nvim, nvim = nvim,
nvim_dir = nvim_dir,
buffer = buffer, buffer = buffer,
window = window, window = window,
tabpage = tabpage, tabpage = tabpage,

4
test/functional/job/job_spec.lua
View File

@ -4,7 +4,7 @@ local clear, nvim, eq, neq, ok, expect, eval, next_message, run, stop, session
= helpers.clear, helpers.nvim, helpers.eq, helpers.neq, helpers.ok, = helpers.clear, helpers.nvim, helpers.eq, helpers.neq, helpers.ok,
helpers.expect, helpers.eval, helpers.next_message, helpers.run, helpers.expect, helpers.eval, helpers.next_message, helpers.run,
helpers.stop, helpers.session helpers.stop, helpers.session
local insert = helpers.insert local nvim_dir, insert = helpers.nvim_dir, helpers.insert
local channel = nvim('get_api_info')[1] local channel = nvim('get_api_info')[1]
@ -150,7 +150,7 @@ describe('jobs', function()
before_each(function() before_each(function()
-- the full path to tty-test seems to be required when running on travis. -- the full path to tty-test seems to be required when running on travis.
insert('build/bin/tty-test') insert(nvim_dir .. '/tty-test')
nvim('command', 'let exec = expand("<cfile>:p")') nvim('command', 'let exec = expand("<cfile>:p")')
nvim('command', notify_str('v:job_data[1]', 'get(v:job_data, 2)')) nvim('command', notify_str('v:job_data[1]', 'get(v:job_data, 2)'))
nvim('command', "let j = jobstart('xxx', exec, [], {})") nvim('command', "let j = jobstart('xxx', exec, [], {})")