Merge remote-tracking branch 'upstream/master' into userreguserreg

9 files changed, 591 insertions, 210 deletions

diff --git a/test/functional/core/channels_spec.lua b/test/functional/core/channels_spec.lua
index 8275575c24..5771ddcb94 100644
--- a/test/functional/core/channels_spec.lua
+++ b/test/functional/core/channels_spec.lua
@@ -230,6 +230,7 @@ describe('channels', function()
   end)
 
   it('can use buffered output mode', function()
+    skip(funcs.executable('grep') == 0, 'missing "grep" command')
     source([[
       let g:job_opts = {
       \ 'on_stdout': function('OnEvent'),
@@ -262,6 +263,7 @@ describe('channels', function()
   end)
 
   it('can use buffered output mode with no stream callback', function()
+    skip(funcs.executable('grep') == 0, 'missing "grep" command')
     source([[
       function! OnEvent(id, data, event) dict
         call rpcnotify(1, a:event, a:id, a:data, self.stdout)
diff --git a/test/functional/core/exit_spec.lua b/test/functional/core/exit_spec.lua
index 05a69e1992..d474b77806 100644
--- a/test/functional/core/exit_spec.lua
+++ b/test/functional/core/exit_spec.lua
@@ -25,30 +25,34 @@ describe('v:exiting', function()
     eq(1, eval('v:exiting is v:null'))
   end)
 
-  it('is 0 on normal exit', function()
+  local function test_exiting(setup_fn)
     local function on_setup()
-      command('autocmd VimLeavePre * call rpcrequest('..cid..', "")')
-      command('autocmd VimLeave    * call rpcrequest('..cid..', "")')
-      command('quit')
+      command('autocmd VimLeavePre * call rpcrequest('..cid..', "exit", "VimLeavePre")')
+      command('autocmd VimLeave    * call rpcrequest('..cid..', "exit", "VimLeave")')
+      setup_fn()
     end
-    local function on_request()
+    local requests_args = {}
+    local function on_request(name, args)
+      eq('exit', name)
+      table.insert(requests_args, args)
       eq(0, eval('v:exiting'))
       return ''
     end
     run(on_request, nil, on_setup)
+    eq({{'VimLeavePre'}, {'VimLeave'}}, requests_args)
+  end
+
+  it('is 0 on normal exit', function()
+    test_exiting(function()
+      command('quit')
+    end)
   end)
+
   it('is 0 on exit from Ex mode involving try-catch vim-patch:8.0.0184', function()
-    local function on_setup()
-      command('autocmd VimLeavePre * call rpcrequest('..cid..', "")')
-      command('autocmd VimLeave    * call rpcrequest('..cid..', "")')
+    test_exiting(function()
       feed('gQ')
       feed_command('try', 'call NoFunction()', 'catch', 'echo "bye"', 'endtry', 'quit')
-    end
-    local function on_request()
-      eq(0, eval('v:exiting'))
-      return ''
-    end
-    run(on_request, nil, on_setup)
+    end)
   end)
 end)
 
@@ -89,14 +93,14 @@ describe(':cquit', function()
   end)
 
   it('exits with redir msg for multiple exit codes after :cquit 1 2', function()
-    test_cq('cquit 1 2', nil, 'nvim_exec(): Vim(cquit):E488: Trailing characters: 2: cquit 1 2')
+    test_cq('cquit 1 2', nil, 'nvim_exec2(): Vim(cquit):E488: Trailing characters: 2: cquit 1 2')
   end)
 
   it('exits with redir msg for non-number exit code after :cquit X', function()
-    test_cq('cquit X', nil, 'nvim_exec(): Vim(cquit):E488: Trailing characters: X: cquit X')
+    test_cq('cquit X', nil, 'nvim_exec2(): Vim(cquit):E488: Trailing characters: X: cquit X')
   end)
 
   it('exits with redir msg for negative exit code after :cquit -1', function()
-    test_cq('cquit -1', nil, 'nvim_exec(): Vim(cquit):E488: Trailing characters: -1: cquit -1')
+    test_cq('cquit -1', nil, 'nvim_exec2(): Vim(cquit):E488: Trailing characters: -1: cquit -1')
   end)
 end)
diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index 4e9891a4de..65f947132e 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -1,4 +1,4 @@
-local lfs = require('lfs')
+local luv = require('luv')
 local helpers = require('test.functional.helpers')(after_each)
 
 local assert_log = helpers.assert_log
@@ -15,10 +15,10 @@ local request = helpers.request
 local retry = helpers.retry
 local rmdir = helpers.rmdir
 local matches = helpers.matches
+local meths = helpers.meths
 local mkdir = helpers.mkdir
 local sleep = helpers.sleep
 local read_file = helpers.read_file
-local tmpname = helpers.tmpname
 local trim = helpers.trim
 local currentdir = helpers.funcs.getcwd
 local assert_alive = helpers.assert_alive
@@ -40,15 +40,18 @@ describe('fileio', function()
     os.remove('Xtest_startup_file1')
     os.remove('Xtest_startup_file1~')
     os.remove('Xtest_startup_file2')
+    os.remove('Xtest_startup_file2~')
     os.remove('Xtest_тест.md')
     os.remove('Xtest-u8-int-max')
     os.remove('Xtest-overwrite-forced')
     rmdir('Xtest_startup_swapdir')
     rmdir('Xtest_backupdir')
+    rmdir('Xtest_backupdir with spaces')
   end)
 
   it('fsync() codepaths #8304', function()
     clear({ args={ '-i', 'Xtest_startup_shada',
+                   '--cmd', 'set nofsync',
                    '--cmd', 'set directory=Xtest_startup_swapdir' } })
 
     -- These cases ALWAYS force fsync (regardless of 'fsync' option):
@@ -132,6 +135,28 @@ describe('fileio', function()
     eq('foo', foo_contents);
   end)
 
+  it('backup with full path with spaces', function()
+    skip(is_ci('cirrus'))
+    clear()
+    mkdir('Xtest_backupdir with spaces')
+    command('set backup')
+    command('set backupdir=Xtest_backupdir\\ with\\ spaces//')
+    command('write Xtest_startup_file1')
+    feed('ifoo<esc>')
+    command('write')
+    feed('Abar<esc>')
+    command('write')
+
+    -- Backup filename = fullpath, separators replaced with "%".
+    local backup_file_name = string.gsub(currentdir()..'/Xtest_startup_file1',
+      is_os('win') and '[:/\\]' or '/', '%%') .. '~'
+    local foo_contents = trim(read_file('Xtest_backupdir with spaces/'..backup_file_name))
+    local foobar_contents = trim(read_file('Xtest_startup_file1'))
+
+    eq('foobar', foobar_contents);
+    eq('foo', foo_contents);
+  end)
+
   it('backup symlinked files #11349', function()
     skip(is_ci('cirrus'))
     clear()
@@ -141,7 +166,7 @@ describe('fileio', function()
     local backup_file_name = link_file_name .. '~'
 
     write_file('Xtest_startup_file1', initial_content, false)
-    lfs.link('Xtest_startup_file1', link_file_name, true)
+    luv.fs_symlink('Xtest_startup_file1', link_file_name)
     command('set backup')
     command('set backupcopy=yes')
     command('edit ' .. link_file_name)
@@ -165,7 +190,7 @@ describe('fileio', function()
     local backup_file_name = backup_dir .. sep .. link_file_name .. '~'
 
     write_file('Xtest_startup_file1', initial_content, false)
-    lfs.link('Xtest_startup_file1', link_file_name, true)
+    luv.fs_symlink('Xtest_startup_file1', link_file_name)
     mkdir(backup_dir)
     command('set backup')
     command('set backupcopy=yes')
@@ -235,8 +260,8 @@ describe('fileio', function()
     screen:expect([[
       {2:WARNING: The file has been changed since}|
       {2: reading it!!!}                          |
-      {3:Do you really want to write to it (y/n)^?}|
-                                              |
+      {3:Do you really want to write to it (y/n)?}|
+      ^                                        |
     ]])
 
     feed("n")
@@ -261,13 +286,11 @@ end)
 describe('tmpdir', function()
   local tmproot_pat = [=[.*[/\\]nvim%.[^/\\]+]=]
   local testlog = 'Xtest_tmpdir_log'
-  local faketmp
+  local os_tmpdir
 
   before_each(function()
     -- Fake /tmp dir so that we can mess it up.
-    faketmp = tmpname()
-    os.remove(faketmp)
-    mkdir(faketmp)
+    os_tmpdir = vim.uv.fs_mkdtemp(vim.fs.dirname(helpers.tmpname()) .. '/nvim_XXXXXXXXXX')
   end)
 
   after_each(function()
@@ -275,16 +298,21 @@ describe('tmpdir', function()
     os.remove(testlog)
   end)
 
-  it('failure modes', function()
-    clear({ env={ NVIM_LOG_FILE=testlog, TMPDIR=faketmp, } })
-    assert_nolog('tempdir is not a directory', testlog)
-    assert_nolog('tempdir has invalid permissions', testlog)
-
+  local function get_tmproot()
     -- Tempfiles typically look like: "…/nvim.<user>/xxx/0".
     --  - "…/nvim.<user>/xxx/" is the per-process tmpdir, not shared with other Nvims.
     --  - "…/nvim.<user>/" is the tmpdir root, shared by all Nvims (normally).
     local tmproot = (funcs.tempname()):match(tmproot_pat)
     ok(tmproot:len() > 4, 'tmproot like "nvim.foo"', tmproot)
+    return tmproot
+  end
+
+  it('failure modes', function()
+    clear({ env={ NVIM_LOG_FILE=testlog, TMPDIR=os_tmpdir, } })
+    assert_nolog('tempdir is not a directory', testlog)
+    assert_nolog('tempdir has invalid permissions', testlog)
+
+    local tmproot = get_tmproot()
 
     -- Test how Nvim handles invalid tmpdir root (by hostile users or accidents).
     --
@@ -292,7 +320,7 @@ describe('tmpdir', function()
     expect_exit(command, ':qall!')
     rmdir(tmproot)
     write_file(tmproot, '')  -- Not a directory, vim_mktempdir() should skip it.
-    clear({ env={ NVIM_LOG_FILE=testlog, TMPDIR=faketmp, } })
+    clear({ env={ NVIM_LOG_FILE=testlog, TMPDIR=os_tmpdir, } })
     matches(tmproot_pat, funcs.stdpath('run'))  -- Tickle vim_mktempdir().
     -- Assert that broken tmpdir root was handled.
     assert_log('tempdir root not a directory', testlog, 100)
@@ -303,18 +331,62 @@ describe('tmpdir', function()
     os.remove(tmproot)
     mkdir(tmproot)
     funcs.setfperm(tmproot, 'rwxr--r--')  -- Invalid permissions, vim_mktempdir() should skip it.
-    clear({ env={ NVIM_LOG_FILE=testlog, TMPDIR=faketmp, } })
+    clear({ env={ NVIM_LOG_FILE=testlog, TMPDIR=os_tmpdir, } })
     matches(tmproot_pat, funcs.stdpath('run'))  -- Tickle vim_mktempdir().
     -- Assert that broken tmpdir root was handled.
     assert_log('tempdir root has invalid permissions', testlog, 100)
   end)
 
   it('too long', function()
-    local bigname = ('%s/%s'):format(faketmp, ('x'):rep(666))
+    local bigname = ('%s/%s'):format(os_tmpdir, ('x'):rep(666))
     mkdir(bigname)
     clear({ env={ NVIM_LOG_FILE=testlog, TMPDIR=bigname, } })
     matches(tmproot_pat, funcs.stdpath('run'))  -- Tickle vim_mktempdir().
     local len = (funcs.tempname()):len()
     ok(len > 4 and len < 256, '4 < len < 256', tostring(len))
   end)
+
+  it('disappeared #1432', function()
+    clear({ env={ NVIM_LOG_FILE=testlog, TMPDIR=os_tmpdir, } })
+    assert_nolog('tempdir disappeared', testlog)
+
+    local function rm_tmpdir()
+      local tmpname1 = funcs.tempname()
+      local tmpdir1 = funcs.fnamemodify(tmpname1, ':h')
+      eq(funcs.stdpath('run'), tmpdir1)
+
+      rmdir(tmpdir1)
+      retry(nil, 1000, function()
+        eq(0, funcs.isdirectory(tmpdir1))
+      end)
+      local tmpname2 = funcs.tempname()
+      local tmpdir2 = funcs.fnamemodify(tmpname2, ':h')
+      neq(tmpdir1, tmpdir2)
+    end
+
+    -- Your antivirus hates you...
+    rm_tmpdir()
+    assert_log('tempdir disappeared', testlog, 100)
+    funcs.tempname()
+    funcs.tempname()
+    funcs.tempname()
+    eq('', meths.get_vvar('errmsg'))
+    rm_tmpdir()
+    funcs.tempname()
+    funcs.tempname()
+    funcs.tempname()
+    eq('E5431: tempdir disappeared (2 times)', meths.get_vvar('errmsg'))
+    rm_tmpdir()
+    eq('E5431: tempdir disappeared (3 times)', meths.get_vvar('errmsg'))
+  end)
+
+  it('$NVIM_APPNAME relative path', function()
+    clear({ env={
+      NVIM_APPNAME='a/b',
+      NVIM_LOG_FILE=testlog,
+      TMPDIR=os_tmpdir,
+    } })
+    matches([=[.*[/\\]a%%b%.[^/\\]+]=], funcs.tempname())
+  end)
+
 end)
diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua
index 1bae626b98..038368c387 100644
--- a/test/functional/core/job_spec.lua
+++ b/test/functional/core/job_spec.lua
@@ -88,7 +88,6 @@ describe('jobs', function()
   end)
 
   it('append environment with pty #env', function()
-    skip(is_os('win'))
     nvim('command', "let $VAR = 'abc'")
     nvim('command', "let $TOTO = 'goodbye world'")
     nvim('command', "let g:job_opts.pty = v:true")
@@ -701,7 +700,7 @@ describe('jobs', function()
     os.remove('Xtest_jobstart_env')
   end)
 
-  describe('jobwait', function()
+  describe('jobwait()', function()
     before_each(function()
       if is_os('win') then
         helpers.set_shell_powershell()
@@ -806,7 +805,6 @@ describe('jobs', function()
     end)
 
     it('can be called recursively', function()
-      skip(is_os('win'), "TODO: Need `cat`")
       source([[
       let g:opts = {}
       let g:counter = 0
@@ -876,6 +874,43 @@ describe('jobs', function()
         eq({'notification', 'wait', {{-1, -1}}}, next_msg())
       end)
     end)
+
+    it('hides cursor and flushes messages before blocking', function()
+      local screen = Screen.new(50, 6)
+      screen:set_default_attr_ids({
+        [0] = {foreground = Screen.colors.Blue, bold = true};  -- NonText
+        [1] = {bold = true, reverse = true};  -- MsgSeparator
+        [2] = {bold = true, foreground = Screen.colors.SeaGreen};  -- MoreMsg
+      })
+      screen:attach()
+      command([[let g:id = jobstart([v:progpath, '--clean', '--headless'])]])
+      source([[
+        func PrintAndWait()
+          echon "aaa\nbbb"
+          call jobwait([g:id], 300)
+          echon "\nccc"
+        endfunc
+      ]])
+      feed_command('call PrintAndWait()')
+      screen:expect{grid=[[
+                                                          |
+        {0:~                                                 }|
+        {0:~                                                 }|
+        {1:                                                  }|
+        aaa                                               |
+        bbb                                               |
+      ]], timeout=100}
+      screen:expect{grid=[[
+                                                          |
+        {1:                                                  }|
+        aaa                                               |
+        bbb                                               |
+        ccc                                               |
+        {2:Press ENTER or type command to continue}^           |
+      ]]}
+      feed('<CR>')
+      funcs.jobstop(meths.get_var('id'))
+    end)
   end)
 
   pending('exit event follows stdout, stderr', function()
diff --git a/test/functional/core/main_spec.lua b/test/functional/core/main_spec.lua
index ab11e14a67..19c7a93730 100644
--- a/test/functional/core/main_spec.lua
+++ b/test/functional/core/main_spec.lua
@@ -1,8 +1,9 @@
-local lfs = require('lfs')
+local luv = require('luv')
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 
 local eq = helpers.eq
+local matches = helpers.matches
 local feed = helpers.feed
 local eval = helpers.eval
 local clear = helpers.clear
@@ -12,34 +13,38 @@ local write_file = helpers.write_file
 local is_os = helpers.is_os
 local skip = helpers.skip
 
-describe('Command-line option', function()
+describe('command-line option', function()
   describe('-s', function()
     local fname = 'Xtest-functional-core-main-s'
     local fname_2 = fname .. '.2'
     local nonexistent_fname = fname .. '.nonexistent'
     local dollar_fname = '$' .. fname
+
     before_each(function()
       clear()
       os.remove(fname)
       os.remove(dollar_fname)
     end)
+
     after_each(function()
       os.remove(fname)
       os.remove(dollar_fname)
     end)
+
     it('treats - as stdin', function()
-      eq(nil, lfs.attributes(fname))
+      eq(nil, luv.fs_stat(fname))
       funcs.system(
         {nvim_prog_abs(), '-u', 'NONE', '-i', 'NONE', '--headless',
          '--cmd', 'set noswapfile shortmess+=IFW fileformats=unix',
          '-s', '-', fname},
         {':call setline(1, "42")', ':wqall!', ''})
       eq(0, eval('v:shell_error'))
-      local attrs = lfs.attributes(fname)
+      local attrs = luv.fs_stat(fname)
       eq(#('42\n'), attrs.size)
     end)
+
     it('does not expand $VAR', function()
-      eq(nil, lfs.attributes(fname))
+      eq(nil, luv.fs_stat(fname))
       eq(true, not not dollar_fname:find('%$%w+'))
       write_file(dollar_fname, ':call setline(1, "100500")\n:wqall!\n')
       funcs.system(
@@ -47,9 +52,10 @@ describe('Command-line option', function()
          '--cmd', 'set noswapfile shortmess+=IFW fileformats=unix',
          '-s', dollar_fname, fname})
       eq(0, eval('v:shell_error'))
-      local attrs = lfs.attributes(fname)
+      local attrs = luv.fs_stat(fname)
       eq(#('100500\n'), attrs.size)
     end)
+
     it('does not crash after reading from stdin in non-headless mode', function()
       skip(is_os('win'))
       local screen = Screen.new(40, 8)
@@ -100,6 +106,7 @@ describe('Command-line option', function()
       ]])
       ]=]
     end)
+
     it('errors out when trying to use nonexistent file with -s', function()
       eq(
         'Cannot open for reading: "'..nonexistent_fname..'": no such file or directory\n',
@@ -110,6 +117,7 @@ describe('Command-line option', function()
            '-s', nonexistent_fname}))
       eq(2, eval('v:shell_error'))
     end)
+
     it('errors out when trying to use -s twice', function()
       write_file(fname, ':call setline(1, "1")\n:wqall!\n')
       write_file(dollar_fname, ':call setline(1, "2")\n:wqall!\n')
@@ -121,7 +129,14 @@ describe('Command-line option', function()
            '--cmd', 'language C',
            '-s', fname, '-s', dollar_fname, fname_2}))
       eq(2, eval('v:shell_error'))
-      eq(nil, lfs.attributes(fname_2))
+      eq(nil, luv.fs_stat(fname_2))
     end)
   end)
+
+  it('nvim -v, :version', function()
+    matches('Run ":verbose version"', funcs.execute(':version'))
+    matches('Compilation: .*Run :checkhealth', funcs.execute(':verbose version'))
+    matches('Run "nvim %-V1 %-v"', funcs.system({nvim_prog_abs(), '-v'}))
+    matches('Compilation: .*Run :checkhealth', funcs.system({nvim_prog_abs(), '-V1', '-v'}))
+  end)
 end)
diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua
index a786887bbd..97c32f7de6 100644
--- a/test/functional/core/path_spec.lua
+++ b/test/functional/core/path_spec.lua
@@ -1,21 +1,25 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
+local command = helpers.command
 local eq = helpers.eq
 local eval = helpers.eval
-local command = helpers.command
-local insert = helpers.insert
 local feed = helpers.feed
+local funcs = helpers.funcs
+local insert = helpers.insert
 local is_os = helpers.is_os
+local mkdir = helpers.mkdir
+local rmdir = helpers.rmdir
+local write_file = helpers.write_file
+
+local function join_path(...)
+  local pathsep = (is_os('win') and '\\' or '/')
+  return table.concat({...}, pathsep)
+end
 
 describe('path collapse', function()
   local targetdir
   local expected_path
 
-  local function join_path(...)
-    local pathsep = (is_os('win') and '\\' or '/')
-    return table.concat({...}, pathsep)
-  end
-
   before_each(function()
     targetdir = join_path('test', 'functional', 'fixtures')
     clear()
@@ -57,14 +61,108 @@ describe('path collapse', function()
   end)
 end)
 
+describe('expand wildcard', function()
+  before_each(clear)
+
+  it('with special characters #24421', function()
+    local folders = is_os('win') and {
+      '{folder}',
+      'folder$name'
+    } or {
+      'folder-name',
+      'folder#name'
+    }
+    for _, folder in ipairs(folders) do
+      mkdir(folder)
+      local file = join_path(folder, 'file.txt')
+      write_file(file, '')
+      eq(file, eval('expand("'..folder..'/*")'))
+      rmdir(folder)
+    end
+  end)
+end)
+
 describe('file search', function()
+  local testdir = 'Xtest_path_spec'
+
   before_each(clear)
 
-  it('find multibyte file name in line #20517', function()
+  setup(function()
+    mkdir(testdir)
+  end)
+
+  teardown(function()
+    rmdir(testdir)
+  end)
+
+  it('gf finds multibyte filename in line #20517', function()
     command('cd test/functional/fixtures')
     insert('filename_with_unicode_ααα')
     eq('', eval('expand("%")'))
     feed('gf')
     eq('filename_with_unicode_ααα', eval('expand("%:t")'))
   end)
+
+  it('gf/<cfile> matches Windows drive-letter filepaths (without ":" in &isfname)', function()
+    local iswin = is_os('win')
+    local function test_cfile(input, expected, expected_win)
+      expected = (iswin and expected_win or expected) or input
+      command('%delete')
+      insert(input)
+      command('norm! 0')
+      eq(expected, eval('expand("<cfile>")'))
+    end
+
+    test_cfile([[c:/d:/foo/bar.txt]]) -- TODO(justinmk): should return "d:/foo/bar.txt" ?
+    test_cfile([[//share/c:/foo/bar/]])
+    test_cfile([[file://c:/foo/bar]])
+    test_cfile([[file://c:/foo/bar:42]])
+    test_cfile([[file://c:/foo/bar:42:666]])
+    test_cfile([[https://c:/foo/bar]])
+    test_cfile([[\foo\bar]], [[foo]], [[\foo\bar]])
+    test_cfile([[/foo/bar]], [[/foo/bar]])
+    test_cfile([[c:\foo\bar]], [[c:]], [[c:\foo\bar]])
+    test_cfile([[c:\foo\bar:42:666]], [[c:]], [[c:\foo\bar]])
+    test_cfile([[c:/foo/bar]])
+    test_cfile([[c:/foo/bar:42]], [[c:/foo/bar]])
+    test_cfile([[c:/foo/bar:42:666]], [[c:/foo/bar]])
+    test_cfile([[c:foo\bar]], [[c]])
+    test_cfile([[c:foo/bar]], [[c]])
+    test_cfile([[c:foo]], [[c]])
+    -- Examples from: https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats#example-ways-to-refer-to-the-same-file
+    test_cfile([[c:\temp\test-file.txt]], [[c:]], [[c:\temp\test-file.txt]])
+    test_cfile([[\\127.0.0.1\c$\temp\test-file.txt]], [[127.0.0.1]], [[\\127.0.0.1\c$\temp\test-file.txt]])
+    test_cfile([[\\LOCALHOST\c$\temp\test-file.txt]], [[LOCALHOST]], [[\\LOCALHOST\c$\temp\test-file.txt]])
+    -- not supported yet
+    test_cfile([[\\.\c:\temp\test-file.txt]], [[.]], [[\\.\c]])
+    -- not supported yet
+    test_cfile([[\\?\c:\temp\test-file.txt]], [[c:]], [[\\]])
+    test_cfile([[\\.\UNC\LOCALHOST\c$\temp\test-file.txt]], [[.]], [[\\.\UNC\LOCALHOST\c$\temp\test-file.txt]])
+    test_cfile([[\\127.0.0.1\c$\temp\test-file.txt]], [[127.0.0.1]], [[\\127.0.0.1\c$\temp\test-file.txt]])
+  end)
+
+  ---@param funcname 'finddir' | 'findfile'
+  local function test_find_func(funcname, folder, item)
+    local d = join_path(testdir, folder)
+    mkdir(d)
+    local expected = join_path(d, item)
+    if funcname == 'finddir' then
+      mkdir(expected)
+    else
+      write_file(expected, '')
+    end
+    eq(expected, funcs[funcname](item, d:gsub(' ', [[\ ]])))
+  end
+
+  it('finddir()', function()
+    test_find_func('finddir', 'directory', 'folder')
+    test_find_func('finddir', 'directory', 'folder name')
+    test_find_func('finddir', 'fold#er name', 'directory')
+  end)
+
+  it('findfile()', function()
+    test_find_func('findfile', 'directory', 'file.txt')
+    test_find_func('findfile', 'directory', 'file name.txt')
+    test_find_func('findfile', 'fold#er name', 'file.txt')
+  end)
 end)
diff --git a/test/functional/core/remote_spec.lua b/test/functional/core/remote_spec.lua
index 846d79abf3..a0ec748446 100644
--- a/test/functional/core/remote_spec.lua
+++ b/test/functional/core/remote_spec.lua
@@ -3,11 +3,12 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local command = helpers.command
 local eq = helpers.eq
+local exec_capture = helpers.exec_capture
 local exec_lua = helpers.exec_lua
 local expect = helpers.expect
 local funcs = helpers.funcs
 local insert = helpers.insert
-local meths = helpers.meths
+local nvim_prog = helpers.nvim_prog
 local new_argv = helpers.new_argv
 local neq = helpers.neq
 local set_session = helpers.set_session
@@ -38,10 +39,10 @@ describe('Remote', function()
       server:close()
     end)
 
+    -- Run a `nvim --remote*` command and return { stdout, stderr } of the process
     local function run_remote(...)
       set_session(server)
       local addr = funcs.serverlist()[1]
-      local client_argv = new_argv({args={'--server', addr, ...}})
 
       -- Create an nvim instance just to run the remote-invoking nvim. We want
       -- to wait for the remote instance to exit and calling jobwait blocks
@@ -50,32 +51,43 @@ describe('Remote', function()
       local client_starter = spawn(new_argv(), false, nil, true)
       set_session(client_starter)
       -- Call jobstart() and jobwait() in the same RPC request to reduce flakiness.
-      eq({ 0 }, exec_lua([[return vim.fn.jobwait({ vim.fn.jobstart(...) })]], client_argv))
+      eq({ 0 }, exec_lua([[return vim.fn.jobwait({ vim.fn.jobstart({...}, {
+        stdout_buffered = true,
+        stderr_buffered = true,
+        on_stdout = function(_, data, _)
+          _G.Remote_stdout = table.concat(data, '\n')
+        end,
+        on_stderr = function(_, data, _)
+          _G.Remote_stderr = table.concat(data, '\n')
+        end,
+      }) })]], nvim_prog, '--clean', '--headless', '--server', addr, ...))
+      local res = exec_lua([[return { _G.Remote_stdout, _G.Remote_stderr }]])
       client_starter:close()
       set_session(server)
+      return res
     end
 
     it('edit a single file', function()
-      run_remote('--remote', fname)
+      eq({ '', '' }, run_remote('--remote', fname))
       expect(contents)
       eq(2, #funcs.getbufinfo())
     end)
 
     it('tab edit a single file with a non-changed buffer', function()
-      run_remote('--remote-tab', fname)
+      eq({ '', '' }, run_remote('--remote-tab', fname))
       expect(contents)
       eq(1, #funcs.gettabinfo())
     end)
 
     it('tab edit a single file with a changed buffer', function()
       insert('hello')
-      run_remote('--remote-tab', fname)
+      eq({ '', '' }, run_remote('--remote-tab', fname))
       expect(contents)
       eq(2, #funcs.gettabinfo())
     end)
 
     it('edit multiple files', function()
-      run_remote('--remote', fname, other_fname)
+      eq({ '', '' }, run_remote('--remote', fname, other_fname))
       expect(contents)
       command('next')
       expect(other_contents)
@@ -83,7 +95,7 @@ describe('Remote', function()
     end)
 
     it('send keys', function()
-      run_remote('--remote-send', ':edit '..fname..'<CR><C-W>v')
+      eq({ '', '' }, run_remote('--remote-send', ':edit '..fname..'<CR><C-W>v'))
       expect(contents)
       eq(2, #funcs.getwininfo())
       -- Only a single buffer as we're using edit and not drop like --remote does
@@ -91,8 +103,13 @@ describe('Remote', function()
     end)
 
     it('evaluate expressions', function()
-      run_remote('--remote-expr', 'setline(1, "Yo")')
+      eq({ '0', '' }, run_remote('--remote-expr', 'setline(1, "Yo")'))
+      eq({ 'Yo', '' }, run_remote('--remote-expr', 'getline(1)'))
       expect('Yo')
+      eq({ ('k'):rep(1234), '' }, run_remote('--remote-expr', 'repeat("k", 1234)'))
+      eq({ '1.25', '' }, run_remote('--remote-expr', '1.25'))
+      eq({ 'no', '' }, run_remote('--remote-expr', '0z6E6F'))
+      eq({ '\t', '' }, run_remote('--remote-expr', '"\t"'))
     end)
   end)
 
@@ -101,7 +118,7 @@ describe('Remote', function()
     expect(contents)
     eq(1, #funcs.getbufinfo())
     -- Since we didn't pass silent, we should get a complaint
-    neq(nil, string.find(meths.exec('messages', true), 'E247'))
+    neq(nil, string.find(exec_capture('messages'), 'E247:'))
   end)
 
   it('creates server if not found with tabs', function()
@@ -110,10 +127,10 @@ describe('Remote', function()
     eq(2, #funcs.gettabinfo())
     eq(2, #funcs.getbufinfo())
     -- We passed silent, so no message should be issued about the server not being found
-    eq(nil, string.find(meths.exec('messages', true), 'E247'))
+    eq(nil, string.find(exec_capture('messages'), 'E247:'))
   end)
 
-  pending('exits with error on', function()
+  describe('exits with error on', function()
     local function run_and_check_exit_code(...)
       local bogus_argv = new_argv(...)
 
diff --git a/test/functional/core/spellfile_spec.lua b/test/functional/core/spellfile_spec.lua
index afd2c1bce4..e3a59085cf 100644
--- a/test/functional/core/spellfile_spec.lua
+++ b/test/functional/core/spellfile_spec.lua
@@ -1,5 +1,4 @@
 local helpers = require('test.functional.helpers')(after_each)
-local lfs = require('lfs')
 
 local eq = helpers.eq
 local clear = helpers.clear
@@ -7,6 +6,7 @@ local meths = helpers.meths
 local exc_exec = helpers.exc_exec
 local rmdir = helpers.rmdir
 local write_file = helpers.write_file
+local mkdir = helpers.mkdir
 
 local testdir = 'Xtest-functional-spell-spellfile.d'
 
@@ -14,8 +14,8 @@ describe('spellfile', function()
   before_each(function()
     clear()
     rmdir(testdir)
-    lfs.mkdir(testdir)
-    lfs.mkdir(testdir .. '/spell')
+    mkdir(testdir)
+    mkdir(testdir .. '/spell')
   end)
   after_each(function()
     rmdir(testdir)
@@ -24,7 +24,7 @@ describe('spellfile', function()
   --                   │       ┌ Spell file version (#VIMSPELLVERSION)
   local spellheader = 'VIMspell\050'
   it('errors out when prefcond section is truncated', function()
-    meths.set_option('runtimepath', testdir)
+    meths.set_option_value('runtimepath', testdir, {})
     write_file(testdir .. '/spell/en.ascii.spl',
     --                         ┌ Section identifier (#SN_PREFCOND)
     --                         │   ┌ Section flags (#SNF_REQUIRED or zero)
@@ -34,12 +34,12 @@ describe('spellfile', function()
     --             │       ┌ Condition length (1 byte)
     --             │       │   ┌ Condition regex (missing!)
                .. '\000\001\001')
-    meths.set_option('spelllang', 'en')
+    meths.set_option_value('spelllang', 'en', {})
     eq('Vim(set):E758: Truncated spell file',
        exc_exec('set spell'))
   end)
   it('errors out when prefcond regexp contains NUL byte', function()
-    meths.set_option('runtimepath', testdir)
+    meths.set_option_value('runtimepath', testdir, {})
     write_file(testdir .. '/spell/en.ascii.spl',
     --                         ┌ Section identifier (#SN_PREFCOND)
     --                         │   ┌ Section flags (#SNF_REQUIRED or zero)
@@ -54,12 +54,12 @@ describe('spellfile', function()
     --             │               ┌ KWORDTREE tree length (4 bytes)
     --             │               │               ┌ PREFIXTREE tree length
                .. '\000\000\000\000\000\000\000\000\000\000\000\000')
-    meths.set_option('spelllang', 'en')
+    meths.set_option_value('spelllang', 'en', {})
     eq('Vim(set):E759: Format error in spell file',
        exc_exec('set spell'))
   end)
   it('errors out when region contains NUL byte', function()
-    meths.set_option('runtimepath', testdir)
+    meths.set_option_value('runtimepath', testdir, {})
     write_file(testdir .. '/spell/en.ascii.spl',
     --                         ┌ Section identifier (#SN_REGION)
     --                         │   ┌ Section flags (#SNF_REQUIRED or zero)
@@ -71,12 +71,12 @@ describe('spellfile', function()
     --             │               ┌ KWORDTREE tree length (4 bytes)
     --             │               │               ┌ PREFIXTREE tree length
                .. '\000\000\000\000\000\000\000\000\000\000\000\000')
-    meths.set_option('spelllang', 'en')
+    meths.set_option_value('spelllang', 'en', {})
     eq('Vim(set):E759: Format error in spell file',
        exc_exec('set spell'))
   end)
   it('errors out when SAL section contains NUL byte', function()
-    meths.set_option('runtimepath', testdir)
+    meths.set_option_value('runtimepath', testdir, {})
     write_file(testdir .. '/spell/en.ascii.spl',
     --                         ┌ Section identifier (#SN_SAL)
     --                         │   ┌ Section flags (#SNF_REQUIRED or zero)
@@ -95,15 +95,15 @@ describe('spellfile', function()
     --             │               ┌ KWORDTREE tree length (4 bytes)
     --             │               │               ┌ PREFIXTREE tree length
                .. '\000\000\000\000\000\000\000\000\000\000\000\000')
-    meths.set_option('spelllang', 'en')
+    meths.set_option_value('spelllang', 'en', {})
     eq('Vim(set):E759: Format error in spell file',
        exc_exec('set spell'))
   end)
   it('errors out when spell header contains NUL bytes', function()
-    meths.set_option('runtimepath', testdir)
+    meths.set_option_value('runtimepath', testdir, {})
     write_file(testdir .. '/spell/en.ascii.spl',
                spellheader:sub(1, -3) .. '\000\000')
-    meths.set_option('spelllang', 'en')
+    meths.set_option_value('spelllang', 'en', {})
     eq('Vim(set):E757: This does not look like a spell file',
        exc_exec('set spell'))
   end)
diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua
index 1be5de6488..94ec3d4907 100644
--- a/test/functional/core/startup_spec.lua
+++ b/test/functional/core/startup_spec.lua
@@ -9,6 +9,8 @@ local ok = helpers.ok
 local eq = helpers.eq
 local matches = helpers.matches
 local eval = helpers.eval
+local exec = helpers.exec
+local exec_capture = helpers.exec_capture
 local exec_lua = helpers.exec_lua
 local feed = helpers.feed
 local funcs = helpers.funcs
@@ -27,21 +29,36 @@ local meths = helpers.meths
 local alter_slashes = helpers.alter_slashes
 local is_os = helpers.is_os
 local dedent = helpers.dedent
-
-local testfile = 'Xtest_startuptime'
-after_each(function()
-  os.remove(testfile)
-en