From 42999a8d645ccf880222f0192671b8ce01bde361 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 30 Jan 2023 14:46:28 +0100
Subject: fix(test): fix issues detected by running unittests in ASAN/UBSAN

---
 test/unit/eval/typval_spec.lua | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index 128625374e..825377813d 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -1677,7 +1677,7 @@ describe('typval.c', function()
           eq(nil, lib.tv_dict_find(nil, 'test', -1))
           eq(nil, lib.tv_dict_find(nil, nil, 0))
         end)
-        itp('works with NULL key', function()
+        itp('works with empty key', function()
           local lua_d = {
             ['']=0,
             t=1,
@@ -1692,7 +1692,6 @@ describe('typval.c', function()
           alloc_log:check({})
           local dis = dict_items(d)
           eq({0, '', dis['']}, {tv_dict_find(d, '', 0)})
-          eq({0, '', dis['']}, {tv_dict_find(d, nil, 0)})
         end)
         itp('works with len properly', function()
           local lua_d = {
@@ -1910,8 +1909,6 @@ describe('typval.c', function()
           }
           local d = dict(lua_d)
           eq(lua_d, dct2tbl(d))
-          eq({{type='fref', fref='tr'}, true},
-             {tv_dict_get_callback(d, nil, 0)})
           eq({{type='fref', fref='tr'}, true},
              {tv_dict_get_callback(d, '', -1)})
           eq({{type='none'}, true},
-- 
cgit 


From 13aa23b62af4df3e7f10687b76fe8c04efa2a598 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 30 Jan 2023 20:36:49 +0100
Subject: refactor(tests): run unittests using main nvim binary in interpreter
 mode

This allows us to get rid of the separate "nvim-test" target
---
 test/unit/helpers.lua  | 5 ++---
 test/unit/tui_spec.lua | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 14d8eda357..686af3b461 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -75,7 +75,8 @@ local function child_cleanup_once(func, ...)
   end
 end
 
-local libnvim = nil
+-- Unittests are run from debug nvim binary in lua interpreter mode.
+local libnvim = ffi.C
 
 local lib = setmetatable({}, {
   __index = only_separate(function(_, idx)
@@ -87,8 +88,6 @@ local lib = setmetatable({}, {
 })
 
 local init = only_separate(function()
-  -- load neovim shared library
-  libnvim = ffi.load(Paths.test_libnvim_path)
   for _, c in ipairs(child_calls_init) do
     c.func(unpack(c.args))
   end
diff --git a/test/unit/tui_spec.lua b/test/unit/tui_spec.lua
index 25b70a17c2..192e35a485 100644
--- a/test/unit/tui_spec.lua
+++ b/test/unit/tui_spec.lua
@@ -12,7 +12,7 @@ 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
+  local handle_background_color = cinput.handle_background_color
   local term_input = ffi.new('TermInput', {})
   local events = globals.main_loop.thread_events
   local kIncomplete = cinput.kIncomplete
-- 
cgit