From ef2e6522c53d562928060a4872020fb8f32c8ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= Date: Thu, 6 Feb 2020 13:41:57 +0100 Subject: [PATCH] tests: bail out on libdir just like $VIMRUNTIME, it cannot be calculated --- src/nvim/api/vim.c | 5 +++++ test/functional/options/defaults_spec.lua | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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