diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-04-09 01:55:19 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-04-09 03:24:14 +0300 |
| commit | 69d1003bf79b7466d2fea45f94aeddbedd246049 (patch) | |
| tree | a07ae303c5999db40a96e37da800c7ab836e8249 /test/functional/helpers.lua | |
| parent | c35bd4d07419a4167f43d1ea60159d922d8bdd11 (diff) | |
| download | rneovim-69d1003bf79b7466d2fea45f94aeddbedd246049.tar.gz rneovim-69d1003bf79b7466d2fea45f94aeddbedd246049.tar.bz2 rneovim-69d1003bf79b7466d2fea45f94aeddbedd246049.zip | |
functests: Fix some tests which are failing locally for unrelated reasons
Diffstat (limited to 'test/functional/helpers.lua')
| -rw-r--r-- | test/functional/helpers.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index adabfde9f7..13e6f36510 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -8,6 +8,7 @@ local Session = require('nvim.session') local TcpStream = require('nvim.tcp_stream') local SocketStream = require('nvim.socket_stream') local ChildProcessStream = require('nvim.child_process_stream') +local Paths = require('test.config.paths') local check_cores = global_helpers.check_cores local check_logs = global_helpers.check_logs @@ -20,7 +21,11 @@ local dedent = global_helpers.dedent local start_dir = lfs.currentdir() -- XXX: NVIM_PROG takes precedence, QuickBuild sets it. -local nvim_prog = os.getenv('NVIM_PROG') or os.getenv('NVIM_PRG') or 'build/bin/nvim' +local nvim_prog = ( + os.getenv('NVIM_PROG') + or os.getenv('NVIM_PRG') + or Paths.test_build_dir .. '/bin/nvim' +) -- Default settings for the test session. local nvim_set = 'set shortmess+=I background=light noswapfile noautoindent' ..' laststatus=1 undodir=. directory=. viewdir=. backupdir=.' |