diff options
| author | John Szakmeister <john@szakmeister.net> | 2015-03-01 15:24:00 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2015-03-01 15:24:00 -0500 |
| commit | ea35062589142459ca657f3977d76636bf9bd29d (patch) | |
| tree | 52d81c9bf318b526c2229c7207dc47d7f224f752 | |
| parent | 32951edc9d653718b60da433c4b16a6a690b26d8 (diff) | |
| parent | c1e8d12aa342e006f07856bfc0f129b5de5324b5 (diff) | |
| download | rneovim-ea35062589142459ca657f3977d76636bf9bd29d.tar.gz rneovim-ea35062589142459ca657f3977d76636bf9bd29d.tar.bz2 rneovim-ea35062589142459ca657f3977d76636bf9bd29d.zip | |
Merge pull request #2075 from jszakmeister/dont-hardcode-tty-test-path
tests: don't hardcode the path to tty-test
| -rw-r--r-- | test/functional/helpers.lua | 10 | ||||
| -rw-r--r-- | test/functional/job/job_spec.lua | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index 508bb6e593..5627b1fae2 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -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', '--cmd', 'set shortmess+=I background=light noswapfile', '--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 if os.getenv('VALGRIND') then @@ -283,6 +292,7 @@ return { expect = expect, ok = ok, nvim = nvim, + nvim_dir = nvim_dir, buffer = buffer, window = window, tabpage = tabpage, diff --git a/test/functional/job/job_spec.lua b/test/functional/job/job_spec.lua index ca653bb269..9bdade7733 100644 --- a/test/functional/job/job_spec.lua +++ b/test/functional/job/job_spec.lua @@ -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.expect, helpers.eval, helpers.next_message, helpers.run, helpers.stop, helpers.session -local insert = helpers.insert +local nvim_dir, insert = helpers.nvim_dir, helpers.insert local channel = nvim('get_api_info')[1] @@ -150,7 +150,7 @@ describe('jobs', function() before_each(function() -- 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', notify_str('v:job_data[1]', 'get(v:job_data, 2)')) nvim('command', "let j = jobstart('xxx', exec, [], {})") |