diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/.luarc.json | 1 | ||||
| -rw-r--r-- | test/functional/script/luacats_grammar_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/script/luacats_parser_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/script/text_utils_spec.lua | 2 | ||||
| -rw-r--r-- | test/lua_runner.lua | 6 |
5 files changed, 6 insertions, 7 deletions
diff --git a/test/.luarc.json b/test/.luarc.json index 1de363557d..f63e15bb41 100644 --- a/test/.luarc.json +++ b/test/.luarc.json @@ -6,6 +6,7 @@ "workspace": { "library": [ "../runtime/lua", + "../src", "../build/usr/share/lua/5.1", "../build", "${3rd}/busted/library", diff --git a/test/functional/script/luacats_grammar_spec.lua b/test/functional/script/luacats_grammar_spec.lua index 6e73f6894b..2fcd0adfa4 100644 --- a/test/functional/script/luacats_grammar_spec.lua +++ b/test/functional/script/luacats_grammar_spec.lua @@ -2,7 +2,7 @@ local t = require('test.testutil') local eq = t.eq -local grammar = require('scripts/luacats_grammar') +local grammar = require('gen.luacats_grammar') describe('luacats grammar', function() --- @param text string diff --git a/test/functional/script/luacats_parser_spec.lua b/test/functional/script/luacats_parser_spec.lua index bc87b38eca..f689f5a22f 100644 --- a/test/functional/script/luacats_parser_spec.lua +++ b/test/functional/script/luacats_parser_spec.lua @@ -2,7 +2,7 @@ local t = require('test.testutil') local eq = t.eq -local parser = require('scripts/luacats_parser') +local parser = require('gen.luacats_parser') --- @param name string --- @param text string diff --git a/test/functional/script/text_utils_spec.lua b/test/functional/script/text_utils_spec.lua index 74098b9287..72239f5f5e 100644 --- a/test/functional/script/text_utils_spec.lua +++ b/test/functional/script/text_utils_spec.lua @@ -11,7 +11,7 @@ local function md_to_vimdoc(text, start_indent, indent, text_width) start_indent = start_indent or 0 indent = indent or 0 text_width = text_width or 70 - local util = require('scripts/util') + local util = require('src/gen/util') return util.md_to_vimdoc(table.concat(text, '\n'), start_indent, indent, text_width) ]], text, diff --git a/test/lua_runner.lua b/test/lua_runner.lua index 158412b04c..3bee035e78 100644 --- a/test/lua_runner.lua +++ b/test/lua_runner.lua @@ -2,10 +2,8 @@ local platform = vim.uv.os_uname() local deps_install_dir = table.remove(_G.arg, 1) local subcommand = table.remove(_G.arg, 1) local suffix = (platform and platform.sysname:lower():find 'windows') and '.dll' or '.so' -package.path = deps_install_dir - .. '/share/lua/5.1/?.lua;' - .. deps_install_dir - .. '/share/lua/5.1/?/init.lua;' +package.path = (deps_install_dir .. '/share/lua/5.1/?.lua;') + .. (deps_install_dir .. '/share/lua/5.1/?/init.lua;') .. package.path package.cpath = deps_install_dir .. '/lib/lua/5.1/?' .. suffix .. ';' .. package.cpath |