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 PR #1877 'Fix functional test suite hang when a test fails'

Browse Source
This commit is contained in:
Thiago de Arruda 2015-01-23 19:36:11 -03:00
commit d84cbfa4dc
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/functional/helpers.lua
View File

@ -6,7 +6,8 @@ local Session = require('nvim.session')
local nvim_prog = os.getenv('NVIM_PROG') or 'build/bin/nvim' 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', '--embed'} '--cmd', 'set shortmess+=I background=light noswapfile',
'--embed'}
local prepend_argv local prepend_argv
if os.getenv('VALGRIND') then if os.getenv('VALGRIND') then
@ -153,8 +154,7 @@ end
local function clear() local function clear()
if session then if session then
session:request('vim_command', 'qa!') session:exit(0)
session:exit()
end end
local loop = Loop.new() local loop = Loop.new()
local msgpack_stream = MsgpackStream.new(loop) local msgpack_stream = MsgpackStream.new(loop)

8
test/functional/ui/screen.lua
View File

@ -85,6 +85,10 @@ Screen.__index = Screen
local debug_screen local debug_screen
local default_screen_timeout = 2500
if os.getenv('VALGRIND') then
default_screen_timeout = 7500
end
function Screen.debug(command) function Screen.debug(command)
if not command then if not command then
@ -187,12 +191,12 @@ function Screen:wait(check, timeout)
end end
return true return true
end end
run(nil, notification_cb, nil, timeout or 5000) run(nil, notification_cb, nil, timeout or default_screen_timeout)
if not checked then if not checked then
err = check() err = check()
end end
if err then if err then
error(err) assert(false, err)
end end
end end

2
third-party/CMakeLists.txt vendored
View File

@ -276,7 +276,7 @@ if(USE_BUNDLED_LUAROCKS)
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client
COMMAND ${DEPS_BIN_DIR}/luarocks COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build https://raw.githubusercontent.com/neovim/lua-client/a6c232da23dafe085c5606a3d0a666a77dd7d8bd/nvim-client-0.0.1-7.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} LIBUV_DIR=${DEPS_INSTALL_DIR} ARGS build https://raw.githubusercontent.com/neovim/lua-client/af161f5f89c7877d0f650b5de6b3a6126b38f012/nvim-client-0.0.1-10.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} LIBUV_DIR=${DEPS_INSTALL_DIR}
DEPENDS lpeg libuv) DEPENDS lpeg libuv)
add_custom_target(nvim-client add_custom_target(nvim-client
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client) DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client)