From 4df38ec9df4764d4b2ae0b12c1b62c34889f1aa5 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Mon, 16 Sep 2019 19:16:39 +0200 Subject: server_requests_spec: fix assertion, pass Lua paths via args (#10875) This makes it pick up the nvim Luarocks module properly when not installed via third-party. --- test/functional/api/rpc_fixture.lua | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'test/functional/api/rpc_fixture.lua') diff --git a/test/functional/api/rpc_fixture.lua b/test/functional/api/rpc_fixture.lua index 87f5a91115..94df751363 100644 --- a/test/functional/api/rpc_fixture.lua +++ b/test/functional/api/rpc_fixture.lua @@ -1,12 +1,8 @@ -local deps_prefix = (os.getenv('DEPS_PREFIX') and os.getenv('DEPS_PREFIX') - or './.deps/usr') - -package.path = deps_prefix .. '/share/lua/5.1/?.lua;' .. - deps_prefix .. '/share/lua/5.1/?/init.lua;' .. - package.path - -package.cpath = deps_prefix .. '/lib/lua/5.1/?.so;' .. - package.cpath +--- RPC server fixture. +-- +-- Lua's paths are passed as arguments to reflect the path in the test itself. +package.path = arg[1] +package.cpath = arg[2] local mpack = require('mpack') local StdioStream = require('nvim.stdio_stream') -- cgit