diff options
| -rw-r--r-- | test/functional/helpers.lua | 6 | ||||
| -rw-r--r-- | test/functional/ui/screen.lua | 8 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index c76979e894..ea98ff4ce3 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -6,7 +6,8 @@ local Session = require('nvim.session') 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', '--embed'} + '--cmd', 'set shortmess+=I background=light noswapfile', + '--embed'} local prepend_argv if os.getenv('VALGRIND') then @@ -153,8 +154,7 @@ end local function clear() if session then - session:request('vim_command', 'qa!') - session:exit() + session:exit(0) end local loop = Loop.new() local msgpack_stream = MsgpackStream.new(loop) diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index 29bbe69d8b..ef99c2a536 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -85,6 +85,10 @@ Screen.__index = Screen local debug_screen +local default_screen_timeout = 2500 +if os.getenv('VALGRIND') then + default_screen_timeout = 7500 +end function Screen.debug(command) if not command then @@ -187,12 +191,12 @@ function Screen:wait(check, timeout) end return true end - run(nil, notification_cb, nil, timeout or 5000) + run(nil, notification_cb, nil, timeout or default_screen_timeout) if not checked then err = check() end if err then - error(err) + assert(false, err) end end diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 7c5906931d..302f7ab1f5 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -276,7 +276,7 @@ if(USE_BUNDLED_LUAROCKS) add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client 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) add_custom_target(nvim-client DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client) |