LSP: fix validate_client_config

- `cmd_env` is a table not a function.
- tests: Set $NVIM_LOG_FILE for fake LSP server.

2 files changed, 8 insertions, 5 deletions

diff --git a/test/functional/fixtures/lsp-test-rpc-server.lua b/test/functional/fixtures/fake-lsp-server.lua
index 44117bea30..44117bea30 100644
--- a/test/functional/fixtures/lsp-test-rpc-server.lua
+++ b/test/functional/fixtures/fake-lsp-server.lua
diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index cab1fb0d79..c384fdedf3 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -16,16 +16,16 @@ local run, stop = helpers.run, helpers.stop
 
 if helpers.pending_win32(pending) then return end
 
-local fake_lsp_server_file = "test/functional/fixtures/lsp-test-rpc-server.lua"
-if iswin() then
-  fake_lsp_server_file = fake_lsp_server_file:gsub("/", "\\")
-end
+local fake_lsp_server_file = 'test/functional/fixtures/fake-lsp-server.lua'
 
 local function fake_lsp_server_setup(test_name, timeout_ms)
   exec_lua([=[
     lsp = require('vim.lsp')
     local test_name, fixture_filename, timeout = ...
     TEST_RPC_CLIENT_ID = lsp.start_client {
+      cmd_env = {
+        NVIM_LOG_FILE = 'Xtest-fake-lsp-server.log'
+      };
       cmd = {
         vim.v.progpath, '-Es', '-u', 'NONE', '--headless',
         "-c", string.format("lua TEST_NAME = %q", test_name),
@@ -117,6 +117,9 @@ describe('LSP', function()
         local test_name, fixture_filename = ...
         function test__start_client()
           return lsp.start_client {
+            cmd_env = {
+              NVIM_LOG_FILE = 'Xtest-fake-lsp-server.log'
+            };
             cmd = {
               vim.v.progpath, '-Es', '-u', 'NONE', '--headless',
               "-c", string.format("lua TEST_NAME = %q", test_name),
@@ -217,7 +220,7 @@ describe('LSP', function()
           client.stop()
         end;
         on_exit = function(code, signal)
-          eq(101, code, "exit code")
+          eq(101, code, "exit code")  -- See fake-lsp-server.lua
           eq(0, signal, "exit signal")
         end;
         on_callback = function(...)