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

8 files changed, 137 insertions, 149 deletions

diff --git a/test/unit/buffer_spec.lua b/test/unit/buffer_spec.lua
index 5dccc2f5a2..a54ea8c656 100644
--- a/test/unit/buffer_spec.lua
+++ b/test/unit/buffer_spec.lua
@@ -28,9 +28,9 @@ describe('buffer functions', function()
 
   setup(function()
     -- create the files
-    io.open(path1, 'w').close()
-    io.open(path2, 'w').close()
-    io.open(path3, 'w').close()
+    io.open(path1, 'w'):close()
+    io.open(path2, 'w'):close()
+    io.open(path3, 'w'):close()
   end)
 
   teardown(function()
@@ -233,10 +233,12 @@ describe('buffer functions', function()
                                      output_buffer,
                                      buffer_byte_size,
                                      to_cstr(pat),
-                                     false,
+                                     NULL,
+                                     0,
                                      fillchar,
                                      maximum_cell_count,
                                      NULL,
+                                     NULL,
                                      NULL)
     end
 
diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index 6387f89fe4..128625374e 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -2175,7 +2175,8 @@ describe('typval.c', function()
         eq({a='TSET'}, dct2tbl(d1))
         eq({a='TSET'}, dct2tbl(d2))
       end)
-      itp('disallows overriding builtin or user functions', function()
+      pending('disallows overriding builtin or user functions: here be the dragons', function()
+        -- pending: see TODO below
         local d = dict()
         d.dv_scope = lib.VAR_DEF_SCOPE
         local f_lua = {
@@ -2196,6 +2197,7 @@ describe('typval.c', function()
         local d5 = dict({Test=f_tv})
         local d6 = dict({Test=p_tv})
         eval0([[execute("function Test()\nendfunction")]])
+        -- TODO: test breaks at this point
         tv_dict_extend(d, d2, 'force',
                        'E704: Funcref variable name must start with a capital: tr')
         tv_dict_extend(d, d3, 'force',
@@ -2253,8 +2255,8 @@ describe('typval.c', function()
         local d1 = dict()
         alloc_log:check({a.dict(d1)})
         eq(1, d1.dv_refcount)
-        eq(false, tv_dict_equal(nil, d1))
-        eq(false, tv_dict_equal(d1, nil))
+        eq(true, tv_dict_equal(nil, d1))
+        eq(true, tv_dict_equal(d1, nil))
         eq(true, tv_dict_equal(d1, d1))
         eq(1, d1.dv_refcount)
         alloc_log:check({})
@@ -2623,7 +2625,7 @@ describe('typval.c', function()
     describe('check_lock()', function()
       local function tv_check_lock(lock, name, name_len, emsg)
         return check_emsg(function()
-          return lib.var_check_lock(lock, name, name_len)
+          return lib.value_check_lock(lock, name, name_len)
         end, emsg)
       end
       itp('works', function()
@@ -2721,8 +2723,8 @@ describe('typval.c', function()
         local d1 = lua2typvalt({})
         alloc_log:check({a.dict(d1.vval.v_dict)})
         eq(1, d1.vval.v_dict.dv_refcount)
-        eq(false, tv_equal(nd, d1))
-        eq(false, tv_equal(d1, nd))
+        eq(true, tv_equal(nd, d1))
+        eq(true, tv_equal(d1, nd))
         eq(true, tv_equal(d1, d1))
         eq(1, d1.vval.v_dict.dv_refcount)
         alloc_log:check({})
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 29ea0235be..14d8eda357 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -7,9 +7,6 @@ local global_helpers = require('test.helpers')
 local assert = require('luassert')
 local say = require('say')
 
-local posix = nil
-local syscall = nil
-
 local check_cores = global_helpers.check_cores
 local dedent = global_helpers.dedent
 local neq = global_helpers.neq
@@ -373,122 +370,91 @@ local function to_cstr(string)
   return cstr(#string + 1, string)
 end
 
-local sc
-
-if posix ~= nil then
-  sc = {
-    fork = posix.fork,
-    pipe = posix.pipe,
-    read = posix.read,
-    write = posix.write,
-    close = posix.close,
-    wait = posix.wait,
-    exit = posix._exit,
-  }
-elseif syscall ~= nil then
-  sc = {
-    fork = syscall.fork,
-    pipe = function()
-      local ret = {syscall.pipe()}
-      return ret[3], ret[4]
-    end,
-    read = function(rd, len)
-      return rd:read(nil, len)
-    end,
-    write = function(wr, s)
-      return wr:write(s)
-    end,
-    close = function(p)
-      return p:close()
-    end,
-    wait = syscall.wait,
-    exit = syscall.exit,
-  }
-else
-  cimport_immediate('./test/unit/fixtures/posix.h')
-  sc = {
-    fork = function()
-      return tonumber(ffi.C.fork())
-    end,
-    pipe = function()
-      local ret = ffi.new('int[2]', {-1, -1})
-      ffi.errno(0)
-      local res = ffi.C.pipe(ret)
-      if (res ~= 0) then
+cimport_immediate('./test/unit/fixtures/posix.h')
+local sc = {
+  fork = function()
+    return tonumber(ffi.C.fork())
+  end,
+  pipe = function()
+    local ret = ffi.new('int[2]', {-1, -1})
+    ffi.errno(0)
+    local res = ffi.C.pipe(ret)
+    if (res ~= 0) then
+      local err = ffi.errno(0)
+      assert(res == 0, ("pipe() error: %u: %s"):format(
+      err, ffi.string(ffi.C.strerror(err))))
+    end
+    assert(ret[0] ~= -1 and ret[1] ~= -1)
+    return ret[0], ret[1]
+  end,
+  read = function(rd, len)
+    local ret = ffi.new('char[?]', len, {0})
+    local total_bytes_read = 0
+    ffi.errno(0)
+    while total_bytes_read < len do
+      local bytes_read = tonumber(ffi.C.read(
+      rd,
+      ffi.cast('void*', ret + total_bytes_read),
+      len - total_bytes_read))
+      if bytes_read == -1 then
         local err = ffi.errno(0)
-        assert(res == 0, ("pipe() error: %u: %s"):format(
-            err, ffi.string(ffi.C.strerror(err))))
-      end
-      assert(ret[0] ~= -1 and ret[1] ~= -1)
-      return ret[0], ret[1]
-    end,
-    read = function(rd, len)
-      local ret = ffi.new('char[?]', len, {0})
-      local total_bytes_read = 0
-      ffi.errno(0)
-      while total_bytes_read < len do
-        local bytes_read = tonumber(ffi.C.read(
-            rd,
-            ffi.cast('void*', ret + total_bytes_read),
-            len - total_bytes_read))
-        if bytes_read == -1 then
-          local err = ffi.errno(0)
-          if err ~= ffi.C.kPOSIXErrnoEINTR then
-            assert(false, ("read() error: %u: %s"):format(
-                err, ffi.string(ffi.C.strerror(err))))
-          end
-        elseif bytes_read == 0 then
-          break
-        else
-          total_bytes_read = total_bytes_read + bytes_read
+        if err ~= ffi.C.kPOSIXErrnoEINTR then
+          assert(false, ("read() error: %u: %s"):format(
+          err, ffi.string(ffi.C.strerror(err))))
         end
+      elseif bytes_read == 0 then
+        break
+      else
+        total_bytes_read = total_bytes_read + bytes_read
       end
-      return ffi.string(ret, total_bytes_read)
-    end,
-    write = function(wr, s)
-      local wbuf = to_cstr(s)
-      local total_bytes_written = 0
-      ffi.errno(0)
-      while total_bytes_written < #s do
-        local bytes_written = tonumber(ffi.C.write(
-            wr,
-            ffi.cast('void*', wbuf + total_bytes_written),
-            #s - total_bytes_written))
-        if bytes_written == -1 then
-          local err = ffi.errno(0)
-          if err ~= ffi.C.kPOSIXErrnoEINTR then
-            assert(false, ("write() error: %u: %s ('%s')"):format(
-                err, ffi.string(ffi.C.strerror(err)), s))
-          end
-        elseif bytes_written == 0 then
-          break
-        else
-          total_bytes_written = total_bytes_written + bytes_written
+    end
+    return ffi.string(ret, total_bytes_read)
+  end,
+  write = function(wr, s)
+    local wbuf = to_cstr(s)
+    local total_bytes_written = 0
+    ffi.errno(0)
+    while total_bytes_written < #s do
+      local bytes_written = tonumber(ffi.C.write(
+      wr,
+      ffi.cast('void*', wbuf + total_bytes_written),
+      #s - total_bytes_written))
+      if bytes_written == -1 then
+        local err = ffi.errno(0)
+        if err ~= ffi.C.kPOSIXErrnoEINTR then
+          assert(false, ("write() error: %u: %s ('%s')"):format(
+          err, ffi.string(ffi.C.strerror(err)), s))
         end
+      elseif bytes_written == 0 then
+        break
+      else
+        total_bytes_written = total_bytes_written + bytes_written
       end
-      return total_bytes_written
-    end,
-    close = ffi.C.close,
-    wait = function(pid)
-      ffi.errno(0)
-      while true do
-        local r = ffi.C.waitpid(pid, nil, ffi.C.kPOSIXWaitWUNTRACED)
-        if r == -1 then
-          local err = ffi.errno(0)
-          if err == ffi.C.kPOSIXErrnoECHILD then
-            break
-          elseif err ~= ffi.C.kPOSIXErrnoEINTR then
-            assert(false, ("waitpid() error: %u: %s"):format(
-                err, ffi.string(ffi.C.strerror(err))))
-          end
-        else
-          assert(r == pid)
+    end
+    return total_bytes_written
+  end,
+  close = ffi.C.close,
+  wait = function(pid)
+    ffi.errno(0)
+    local stat_loc = ffi.new('int[1]', {0})
+    while true do
+      local r = ffi.C.waitpid(pid, stat_loc, ffi.C.kPOSIXWaitWUNTRACED)
+      if r == -1 then
+        local err = ffi.errno(0)
+        if err == ffi.C.kPOSIXErrnoECHILD then
+          break
+        elseif err ~= ffi.C.kPOSIXErrnoEINTR then
+          assert(false, ("waitpid() error: %u: %s"):format(
+          err, ffi.string(ffi.C.strerror(err))))
         end
+      else
+        assert(r == pid)
       end
-    end,
-    exit = ffi.C._exit,
-  }
-end
+    end
+    return stat_loc[0]
+  end,
+  exit = ffi.C._exit,
+}
 
 local function format_list(lst)
   local ret = ''
@@ -730,18 +696,22 @@ local function check_child_err(rd)
   end
 end
 
-local function itp_parent(rd, pid, allow_failure)
-  local err, emsg = pcall(check_child_err, rd)
-  sc.wait(pid)
+local function itp_parent(rd, pid, allow_failure, location)
+  local ok, emsg = pcall(check_child_err, rd)
+  local status = sc.wait(pid)
   sc.close(rd)
-  if not err then
+  if not ok then
     if allow_failure then
-      io.stderr:write('Errorred out:\n' .. tostring(emsg) .. '\n')
+      io.stderr:write('Errorred out ('..status..'):\n' .. tostring(emsg) .. '\n')
       os.execute([[
         sh -c "source ci/common/test.sh
         check_core_dumps --delete \"]] .. Paths.test_luajit_prg .. [[\""]])
     else
-      error(emsg)
+      error(tostring(emsg)..'\nexit code: '..status)
+    end
+  elseif status ~= 0 then
+    if not allow_failure then
+      error("child process errored out with status "..status.."!\n\n"..location)
     end
   end
 end
@@ -758,6 +728,11 @@ local function gen_itp(it)
       -- FIXME Fix tests with this true
       return
     end
+
+    -- Pre-emptively calculating error location, wasteful, ugh!
+    -- But the way this code messes around with busted implies the real location is strictly
+    -- not available in the parent when an actual error occurs. so we have to do this here.
+    local location = debug.traceback()
     it(name, function()
       local rd, wr = sc.pipe()
       child_pid = sc.fork()
@@ -768,7 +743,7 @@ local function gen_itp(it)
         sc.close(wr)
         local saved_child_pid = child_pid
         child_pid = nil
-        itp_parent(rd, saved_child_pid, allow_failure)
+        itp_parent(rd, saved_child_pid, allow_failure, location)
       end
     end)
   end
diff --git a/test/unit/message_spec.lua b/test/unit/message_spec.lua
index 7e92b5c857..549eff6e03 100644
--- a/test/unit/message_spec.lua
+++ b/test/unit/message_spec.lua
@@ -22,7 +22,7 @@ describe('trunc_string', function()
   local function test_copy(s, expected, room)
     room = room and room or 20
     local buf = cimp.xmalloc(ffi.sizeof('char_u') * buflen)
-    local str = cimp.vim_strsave(to_cstr(s))
+    local str = cimp.xstrdup(to_cstr(s))
     cimp.trunc_string(str, buf, room, buflen)
     eq(expected, ffi.string(buf))
     cimp.xfree(buf)
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index 0bb33772cd..c718244ea4 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -72,9 +72,9 @@ describe('fs.c', function()
   before_each(function()
     lfs.mkdir('unit-test-directory');
 
-    io.open('unit-test-directory/test.file', 'w').close()
+    io.open('unit-test-directory/test.file', 'w'):close()
 
-    io.open('unit-test-directory/test_2.file', 'w').close()
+    io.open('unit-test-directory/test_2.file', 'w'):close()
     lfs.link('test.file', 'unit-test-directory/test_link.file', true)
 
     lfs.link('non_existing_file.file', 'unit-test-directory/test_broken_link.file', true)
@@ -472,7 +472,7 @@ describe('fs.c', function()
 
     describe('os_remove', function()
       before_each(function()
-        io.open('unit-test-directory/test_remove.file', 'w').close()
+        io.open('unit-test-directory/test_remove.file', 'w'):close()
       end)
 
       after_each(function()
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index fb476397e6..1fc4e2496e 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -82,8 +82,8 @@ describe('path.c', function()
     local f2 = 'f2.o'
     before_each(function()
       -- create the three files that will be used in this spec
-      io.open(f1, 'w').close()
-      io.open(f2, 'w').close()
+      io.open(f1, 'w'):close()
+      io.open(f2, 'w'):close()
     end)
 
     after_each(function()
@@ -355,7 +355,7 @@ end)
 describe('path.c', function()
   setup(function()
     lfs.mkdir('unit-test-directory');
-    io.open('unit-test-directory/test.file', 'w').close()
+    io.open('unit-test-directory/test.file', 'w'):close()
 
     -- Since the tests are executed, they are called by an executable. We use
     -- that executable for several asserts.
@@ -504,6 +504,16 @@ describe('path.c', function()
       eq(OK, result)
     end)
 
+    itp('does not remove trailing slash from non-existing relative directory #20847', function()
+      local expected = lfs.currentdir() .. '/non_existing_dir/'
+      local filename = 'non_existing_dir/'
+      local buflen = get_buf_len(expected, filename)
+      local do_expand = 1
+      local buf, result = vim_FullName(filename, buflen, do_expand)
+      eq(expected, ffi.string(buf))
+      eq(OK, result)
+    end)
+
     itp('expands "./" to the current directory #7117', function()
       local expected = lfs.currentdir() .. '/unit-test-directory/test.file'
       local filename = './unit-test-directory/test.file'
@@ -640,6 +650,10 @@ describe('path.c', function()
       eq(2, path_with_url([[test-abc:\\xyz\foo\b3]]))
       eq(0, path_with_url([[-test://xyz/foo/b4]]))
       eq(0, path_with_url([[test-://xyz/foo/b5]]))
+      eq(1, path_with_url([[test-C:/xyz/foo/b5]]))
+      eq(1, path_with_url([[test-custom:/xyz/foo/b5]]))
+      eq(0, path_with_url([[c:/xyz/foo/b5]]))
+      eq(0, path_with_url([[C:/xyz/foo/b5]]))
     end)
   end)
 end)
diff --git a/test/unit/search_spec.lua b/test/unit/search_spec.lua
index ce37ebfc3a..be905bf5f0 100644
--- a/test/unit/search_spec.lua
+++ b/test/unit/search_spec.lua
@@ -37,7 +37,7 @@ end)
 describe('search_regcomp', function()
   local search_regcomp = function(pat, pat_save, pat_use, options )
     local regmatch = ffi.new("regmmatch_T")
-    local fail = search.search_regcomp(to_cstr(pat), pat_save, pat_use, options, regmatch)
+    local fail = search.search_regcomp(to_cstr(pat), nil, pat_save, pat_use, options, regmatch)
     return fail, regmatch
   end
 
diff --git a/test/unit/tui_spec.lua b/test/unit/tui_spec.lua
index 36ce4a1493..25b70a17c2 100644
--- a/test/unit/tui_spec.lua
+++ b/test/unit/tui_spec.lua
@@ -9,6 +9,7 @@ local cinput = cimport("./src/nvim/tui/input.h")
 local rbuffer = cimport("./test/unit/fixtures/rbuffer.h")
 local globals = cimport("./src/nvim/globals.h")
 local multiqueue = cimport("./test/unit/fixtures/multiqueue.h")
+local ui_client = cimport("./src/nvim/ui_client.h")
 
 itp('handle_background_color', function()
   local handle_background_color = cinput.ut_handle_background_color
@@ -33,11 +34,9 @@ itp('handle_background_color', function()
     term_input.waiting_for_bg_response = 1
     eq(kComplete, handle_background_color(term_input))
     eq(0, term_input.waiting_for_bg_response)
-    eq(1, multiqueue.multiqueue_size(events))
-
-    local event = multiqueue.multiqueue_get(events)
-    local bg_event = ffi.cast("Event*", event.argv[1])
-    eq(bg, ffi.string(bg_event.argv[0]))
+    eq(0, multiqueue.multiqueue_size(events))
+    eq(bg, ({[0]="light", [1] = "dark", [-1] = "none"})
+           [tonumber(ui_client.ui_client_bg_response)])
 
     -- Buffer has been consumed.
     eq(0, rbuf.size)
@@ -114,9 +113,7 @@ itp('handle_background_color', function()
   eq(kComplete, handle_background_color(term_input))
   eq(0, term_input.waiting_for_bg_response)
 
-  local event = multiqueue.multiqueue_get(events)
-  local bg_event = ffi.cast("Event*", event.argv[1])
-  eq('light', ffi.string(bg_event.argv[0]))
+  eq(0, tonumber(ui_client.ui_client_bg_response))
   eq(0, multiqueue.multiqueue_size(events))
   eq(0, rbuf.size)
 
@@ -133,9 +130,7 @@ itp('handle_background_color', function()
   eq(kComplete, handle_background_color(term_input))
   eq(0, term_input.waiting_for_bg_response)
 
-  event = multiqueue.multiqueue_get(events)
-  bg_event = ffi.cast("Event*", event.argv[1])
-  eq('light', ffi.string(bg_event.argv[0]))
+  eq(0, tonumber(ui_client.ui_client_bg_response))
   eq(0, multiqueue.multiqueue_size(events))
   eq(0, rbuf.size)
 
@@ -161,7 +156,7 @@ itp('handle_background_color', function()
   eq(kComplete, handle_background_color(term_input))
   eq(0, term_input.waiting_for_bg_response)
 
-  eq(1, multiqueue.multiqueue_size(events))
+  eq(0, multiqueue.multiqueue_size(events))
   eq(3, rbuf.size)
   rbuffer.rbuffer_consumed(rbuf, rbuf.size)
 end)