diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/api/rpc_fixture.lua | 6 | ||||
| -rw-r--r-- | test/helpers.lua | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/test/functional/api/rpc_fixture.lua b/test/functional/api/rpc_fixture.lua index e885a525af..87f5a91115 100644 --- a/test/functional/api/rpc_fixture.lua +++ b/test/functional/api/rpc_fixture.lua @@ -1,7 +1,5 @@ -local deps_prefix = './.deps/usr' -if os.getenv('DEPS_PREFIX') then - deps_prefix = os.getenv('DEPS_PREFIX') -end +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;' .. diff --git a/test/helpers.lua b/test/helpers.lua index e4c3019adc..795808005d 100644 --- a/test/helpers.lua +++ b/test/helpers.lua @@ -235,6 +235,11 @@ local function hasenv(name) return nil end +local function deps_prefix() + local env = os.getenv('DEPS_PREFIX') + return (env and env ~= '') and env or '.deps/usr' +end + local tests_skipped = 0 local function check_cores(app, force) @@ -263,7 +268,7 @@ local function check_cores(app, force) else initial_path = '.' re = '/core[^/]*$' - exc_re = { '^/%.deps$', local_tmpdir, '^/%node_modules$' } + exc_re = { '^/%.deps$', '^/%'..deps_prefix()..'$', local_tmpdir, '^/%node_modules$' } db_cmd = gdb_db_cmd random_skip = true end |