diff --git a/test/functional/testterm.lua b/test/functional/testterm.lua index d672a92a6a..6c1979a9da 100644 --- a/test/functional/testterm.lua +++ b/test/functional/testterm.lua @@ -206,6 +206,8 @@ function M.setup_child_nvim(args, opts) local env = t.shallowcopy(opts.env) or {} env.VIMRUNTIME = env.VIMRUNTIME or os.getenv('VIMRUNTIME') env.NVIM_TEST = env.NVIM_TEST or os.getenv('NVIM_TEST') + -- Child servers need the socket dir set by runner.lua. + env.XDG_RUNTIME_DIR = env.XDG_RUNTIME_DIR or os.getenv('XDG_RUNTIME_DIR') return M.setup_screen(opts.extra_rows, argv, opts.cols, env) end diff --git a/test/runner.lua b/test/runner.lua index d42309bb62..23068a511d 100644 --- a/test/runner.lua +++ b/test/runner.lua @@ -38,6 +38,12 @@ if _G.arg[1] and vim.startswith(_G.arg[1], '-X') then vim.env.XDG_CONFIG_HOME = xdg_dir .. '/config' vim.env.XDG_DATA_HOME = xdg_dir .. '/share' vim.env.XDG_STATE_HOME = xdg_dir .. '/state' + if vim.fn.has('win32') == 0 then + -- Socket dir (stdpath("run")), deliberately NOT in the build dir. sockaddr_un.sun_path is 104 + -- bytes on macOS/BSD, "/…/build/tmp/nvim.." can exceed it. #38623 + vim.env.XDG_RUNTIME_DIR = ('/tmp/nvim_%d'):format(vim.uv.os_getpid()) + vim.fn.mkdir(vim.env.XDG_RUNTIME_DIR, 'p') + end end local root = repo_root()