diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2020-02-06 13:41:57 +0100 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2020-02-07 09:32:25 +0100 |
| commit | ef2e6522c53d562928060a4872020fb8f32c8ff8 (patch) | |
| tree | 350037cc790f936de3d863bcab8f499a1d1db6d0 | |
| parent | 00c57c98dfb2df58875a3d9ad8fc557ec9a24cba (diff) | |
| download | rneovim-ef2e6522c53d562928060a4872020fb8f32c8ff8.tar.gz rneovim-ef2e6522c53d562928060a4872020fb8f32c8ff8.tar.bz2 rneovim-ef2e6522c53d562928060a4872020fb8f32c8ff8.zip | |
tests: bail out on libdir just like $VIMRUNTIME, it cannot be calculated
| -rw-r--r-- | src/nvim/api/vim.c | 5 | ||||
| -rw-r--r-- | test/functional/options/defaults_spec.lua | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 29ec0207ba..30fc48fea5 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -732,6 +732,11 @@ static void find_runtime_cb(char_u *fname, void *cookie) ADD(*rv, STRING_OBJ(cstr_to_string((char *)fname))); } +String nvim__get_lib_dir(void) +{ + return cstr_as_string(get_lib_dir()); +} + /// Changes the global working directory. /// /// @param dir Directory path diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua index 6de8017434..11ce26410d 100644 --- a/test/functional/options/defaults_spec.lua +++ b/test/functional/options/defaults_spec.lua @@ -295,7 +295,9 @@ describe('XDG-based defaults', function() local function vimruntime_and_libdir() local vimruntime = eval('$VIMRUNTIME') - local libdir = string.gsub(vimruntime, "share/nvim/runtime$", "lib/nvim") + -- libdir is hard to calculate reliably across various ci platforms + -- local libdir = string.gsub(vimruntime, "share/nvim/runtime$", "lib/nvim") + local libdir = meths._get_lib_dir() return vimruntime, libdir end |