Merge branch 'master' into rename-execute

7 files changed, 161 insertions, 103 deletions

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 13e6f36510..13b06e7f1b 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -251,12 +251,13 @@ local function retry(max, max_ms, fn)
       return result
     end
     if (max and tries >= max) or (luv.now() - start_time > timeout) then
-      break
+      if type(result) == "string" then
+        result = "\nretry() attempts: "..tostring(tries).."\n"..result
+      end
+      error(result)
     end
     tries = tries + 1
   end
-  -- Do not use pcall() for the final attempt, let the failure bubble up.
-  return fn()
 end
 
 local function clear(...)
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index fb8a61d10d..b14bceecdd 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -2,9 +2,10 @@
 -- as a simple way to send keys and assert screen state.
 local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
-local feed = thelpers.feed_data
+local feed_data = thelpers.feed_data
 local feed_command = helpers.feed_command
 local nvim_dir = helpers.nvim_dir
+local retry = helpers.retry
 
 if helpers.pending_win32(pending) then return end
 
@@ -34,7 +35,7 @@ describe('tui', function()
   end)
 
   it('accepts basic utf-8 input', function()
-    feed('iabc\ntest1\ntest2')
+    feed_data('iabc\ntest1\ntest2')
     screen:expect([[
       abc                                               |
       test1                                             |
@@ -44,7 +45,7 @@ describe('tui', function()
       {3:-- INSERT --}                                      |
       {3:-- TERMINAL --}                                    |
     ]])
-    feed('\027')
+    feed_data('\027')
     screen:expect([[
       abc                                               |
       test1                                             |
@@ -60,7 +61,7 @@ describe('tui', function()
     local keys = 'dfghjkl'
     for c in keys:gmatch('.') do
       feed_command('nnoremap <a-'..c..'> ialt-'..c..'<cr><esc>')
-      feed('\027'..c)
+      feed_data('\027'..c)
     end
     screen:expect([[
       alt-j                                             |
@@ -71,7 +72,7 @@ describe('tui', function()
                                                         |
       {3:-- TERMINAL --}                                    |
     ]])
-    feed('gg')
+    feed_data('gg')
     screen:expect([[
       {1:a}lt-d                                             |
       alt-f                                             |
@@ -90,7 +91,7 @@ describe('tui', function()
     -- Example: for input ALT+j:
     --    * Vim (Nvim prior to #3982) sets high-bit, inserts "ê".
     --    * Nvim (after #3982) inserts "j".
-    feed('i\027j')
+    feed_data('i\027j')
     screen:expect([[
       j{1: }                                                |
       {4:~                                                 }|
@@ -103,10 +104,10 @@ describe('tui', function()
   end)
 
   it('accepts ascii control sequences', function()
-    feed('i')
-    feed('\022\007') -- ctrl+g
-    feed('\022\022') -- ctrl+v
-    feed('\022\013') -- ctrl+m
+    feed_data('i')
+    feed_data('\022\007') -- ctrl+g
+    feed_data('\022\022') -- ctrl+v
+    feed_data('\022\013') -- ctrl+m
     screen:expect([[
     {9:^G^V^M}{1: }                                           |
     {4:~                                                 }|
@@ -119,7 +120,7 @@ describe('tui', function()
   end)
 
   it('automatically sends <Paste> for bracketed paste sequences', function()
-    feed('i\027[200~')
+    feed_data('i\027[200~')
     screen:expect([[
       {1: }                                                 |
       {4:~                                                 }|
@@ -129,7 +130,7 @@ describe('tui', function()
       {3:-- INSERT (paste) --}                              |
       {3:-- TERMINAL --}                                    |
     ]])
-    feed('pasted from terminal')
+    feed_data('pasted from terminal')
     screen:expect([[
       pasted from terminal{1: }                             |
       {4:~                                                 }|
@@ -139,7 +140,7 @@ describe('tui', function()
       {3:-- INSERT (paste) --}                              |
       {3:-- TERMINAL --}                                    |
     ]])
-    feed('\027[201~')
+    feed_data('\027[201~')
     screen:expect([[
       pasted from terminal{1: }                             |
       {4:~                                                 }|
@@ -157,7 +158,7 @@ describe('tui', function()
     for i = 1, 3000 do
       t[i] = 'item ' .. tostring(i)
     end
-    feed('i\027[200~'..table.concat(t, '\n')..'\027[201~')
+    feed_data('i\027[200~'..table.concat(t, '\n')..'\027[201~')
     screen:expect([[
       item 2997                                         |
       item 2998                                         |
@@ -180,7 +181,7 @@ describe('tui with non-tty file descriptors', function()
   it('can handle pipes as stdout and stderr', function()
     local screen = thelpers.screen_setup(0, '"'..helpers.nvim_prog
       ..' -u NONE -i NONE --cmd \'set noswapfile noshowcmd noruler\' --cmd \'normal iabc\' > /dev/null 2>&1 && cat testF && rm testF"')
-    feed(':w testF\n:q\n')
+    feed_data(':w testF\n:q\n')
     screen:expect([[
       :w testF                                          |
       :q                                                |
@@ -200,12 +201,13 @@ describe('tui focus event handling', function()
     helpers.clear()
     screen = thelpers.screen_setup(0, '["'..helpers.nvim_prog
       ..'", "-u", "NONE", "-i", "NONE", "--cmd", "set noswapfile noshowcmd noruler"]')
-    feed_command('autocmd FocusGained * echo "gained"')
-    feed_command('autocmd FocusLost * echo "lost"')
+    feed_data(":autocmd FocusGained * echo 'gained'\n")
+    feed_data(":autocmd FocusLost * echo 'lost'\n")
+    feed_data("\034\016")  -- CTRL-\ CTRL-N
   end)
 
   it('can handle focus events in normal mode', function()
-    feed('\027[I')
+    feed_data('\027[I')
     screen:expect([[
       {1: }                                                 |
       {4:~                                                 }|
@@ -216,7 +218,7 @@ describe('tui focus event handling', function()
       {3:-- TERMINAL --}                                    |
     ]])
 
-    feed('\027[O')
+    feed_data('\027[O')
     screen:expect([[
       {1: }                                                 |
       {4:~                                                 }|
@@ -230,8 +232,8 @@ describe('tui focus event handling', function()
 
   it('can handle focus events in insert mode', function()
     feed_command('set noshowmode')
-    feed('i')
-    feed('\027[I')
+    feed_data('i')
+    feed_data('\027[I')
     screen:expect([[
       {1: }                                                 |
       {4:~                                                 }|
@@ -241,7 +243,7 @@ describe('tui focus event handling', function()
       gained                                            |
       {3:-- TERMINAL --}                                    |
     ]])
-    feed('\027[O')
+    feed_data('\027[O')
     screen:expect([[
       {1: }                                                 |
       {4:~                                                 }|
@@ -254,8 +256,8 @@ describe('tui focus event handling', function()
   end)
 
   it('can handle focus events in cmdline mode', function()
-    feed(':')
-    feed('\027[I')
+    feed_data(':')
+    feed_data('\027[I')
     screen:expect([[
                                                         |
       {4:~                                                 }|
@@ -265,7 +267,7 @@ describe('tui focus event handling', function()
       g{1:a}ined                                            |
       {3:-- TERMINAL --}                                    |
     ]])
-    feed('\027[O')
+    feed_data('\027[O')
     screen:expect([[
                                                         |
       {4:~                                                 }|
@@ -278,30 +280,36 @@ describe('tui focus event handling', function()
   end)
 
   it('can handle focus events in terminal mode', function()
-    feed_command('set shell='..nvim_dir..'/shell-test')
-    feed_command('set laststatus=0')
-    feed_command('set noshowmode')
-    feed_command('terminal')
-    feed('\027[I')
-    screen:expect([[
-      ready $                                           |
-      [Process exited 0]{1: }                               |
-                                                        |
-                                                        |
-                                                        |
-      gained                                            |
-      {3:-- TERMINAL --}                                    |
-    ]])
-   feed('\027[O')
-    screen:expect([[
-      ready $                                           |
-      [Process exited 0]{1: }                               |
-                                                        |
-                                                        |
-                                                        |
-      lost                                              |
-      {3:-- TERMINAL --}                                    |
-    ]])
+    feed_data(':set shell='..nvim_dir..'/shell-test\n')
+    feed_data(':set noshowmode laststatus=0\n')
+
+    retry(2, 3 * screen.timeout, function()
+      feed_data(':terminal\n')
+      feed_data('\027[I')
+      screen:expect([[
+        ready $                                           |
+        [Process exited 0]{1: }                               |
+                                                          |
+                                                          |
+                                                          |
+        gained                                            |
+        {3:-- TERMINAL --}                                    |
+      ]])
+      feed_data('\027[O')
+      screen:expect([[
+        ready $                                           |
+        [Process exited 0]{1: }                               |
+                                                          |
+                                                          |
+                                                          |
+        lost                                              |
+        {3:-- TERMINAL --}                                    |
+      ]])
+
+      -- If retry is needed...
+      feed_data("\034\016")  -- CTRL-\ CTRL-N
+      feed_data(':bwipeout!\n')
+    end)
   end)
 end)
 
diff --git a/test/helpers.lua b/test/helpers.lua
index 3fc10e9e30..d0b1ad552b 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -17,18 +17,28 @@ local ok = function(res)
   return assert.is_true(res)
 end
 
+-- initial_path:  directory to recurse into
+-- re:            include pattern (string)
+-- exc_re:        exclude pattern(s) (string or table)
 local function glob(initial_path, re, exc_re)
+  exc_re = type(exc_re) == 'table' and exc_re or { exc_re }
   local paths_to_check = {initial_path}
   local ret = {}
   local checked_files = {}
+  local function is_excluded(path)
+    for _, pat in pairs(exc_re) do
+      if path:match(pat) then return true end
+    end
+    return false
+  end
+
   while #paths_to_check > 0 do
     local cur_path = paths_to_check[#paths_to_check]
     paths_to_check[#paths_to_check] = nil
     for e in lfs.dir(cur_path) do
       local full_path = cur_path .. '/' .. e
       local checked_path = full_path:sub(#initial_path + 1)
-      if ((not exc_re or not checked_path:match(exc_re))
-          and e:sub(1, 1) ~= '.') then
+      if (not is_excluded(checked_path)) and e:sub(1, 1) ~= '.' then
         local attrs = lfs.attributes(full_path)
         if attrs then
           local check_key = attrs.dev .. ':' .. tostring(attrs.ino)
@@ -106,13 +116,20 @@ local uname = (function()
   end)
 end)()
 
+local function tmpdir_get()
+  return os.getenv('TMPDIR') and os.getenv('TMPDIR') or os.getenv('TEMP')
+end
+
+-- Is temp directory `dir` defined local to the project workspace?
+local function tmpdir_is_local(dir)
+  return not not (dir and string.find(dir, 'Xtest'))
+end
+
 local tmpname = (function()
   local seq = 0
-  local tmpdir = os.getenv('TMPDIR') and os.getenv('TMPDIR') or os.getenv('TEMP')
-  -- Is $TMPDIR defined local to the project workspace?
-  local in_workspace = not not (tmpdir and string.find(tmpdir, 'Xtest'))
+  local tmpdir = tmpdir_get()
   return (function()
-    if in_workspace then
+    if tmpdir_is_local(tmpdir) then
       -- Cannot control os.tmpname() dir, so hack our own tmpname() impl.
       seq = seq + 1
       local fname = tmpdir..'/nvim-test-lua-'..seq
@@ -162,33 +179,34 @@ end
 
 local tests_skipped = 0
 
-local function check_cores(app)
+local function check_cores(app, force)
   app = app or 'build/bin/nvim'
   local initial_path, re, exc_re
   local gdb_db_cmd = 'gdb -n -batch -ex "thread apply all bt full" "$_NVIM_TEST_APP" -c "$_NVIM_TEST_CORE"'
   local lldb_db_cmd = 'lldb -Q -o "bt all" -f "$_NVIM_TEST_APP" -c "$_NVIM_TEST_CORE"'
   local random_skip = false
+  local local_tmpdir = tmpdir_is_local(tmpdir_get()) and tmpdir_get() or nil
   local db_cmd
   if hasenv('NVIM_TEST_CORE_GLOB_DIRECTORY') then
     initial_path = os.getenv('NVIM_TEST_CORE_GLOB_DIRECTORY')
     re = os.getenv('NVIM_TEST_CORE_GLOB_RE')
-    exc_re = os.getenv('NVIM_TEST_CORE_EXC_RE')
+    exc_re = { os.getenv('NVIM_TEST_CORE_EXC_RE'), local_tmpdir }
     db_cmd = os.getenv('NVIM_TEST_CORE_DB_CMD') or gdb_db_cmd
     random_skip = os.getenv('NVIM_TEST_CORE_RANDOM_SKIP')
   elseif os.getenv('TRAVIS_OS_NAME') == 'osx' then
     initial_path = '/cores'
     re = nil
-    exc_re = nil
+    exc_re = { local_tmpdir }
     db_cmd = lldb_db_cmd
   else
     initial_path = '.'
     re = '/core[^/]*$'
-    exc_re = '^/%.deps$'
+    exc_re = { '^/%.deps$', local_tmpdir }
     db_cmd = gdb_db_cmd
     random_skip = true
   end
   -- Finding cores takes too much time on linux
-  if random_skip and math.random() < 0.9 then
+  if not force and random_skip and math.random() < 0.9 then
     tests_skipped = tests_skipped + 1
     return
   end
diff --git a/test/unit/eval/decode_spec.lua b/test/unit/eval/decode_spec.lua
index 0b2a423cd6..0c444b33f2 100644
--- a/test/unit/eval/decode_spec.lua
+++ b/test/unit/eval/decode_spec.lua
@@ -2,7 +2,6 @@ local helpers = require('test.unit.helpers')(after_each)
 local itp = helpers.gen_itp(it)
 
 local cimport = helpers.cimport
-local to_cstr = helpers.to_cstr
 local eq = helpers.eq
 local neq = helpers.neq
 local ffi = helpers.ffi
@@ -72,7 +71,7 @@ describe('json_decode_string()', function()
   end
 
   itp('does not overflow in error messages', function()
-    local saved_p_enc = decode.p_enc
+    collectgarbage('restart')
     check_failure(']test', 1, 'E474: No container to close: ]')
     check_failure('[}test', 2, 'E474: Closing list with curly bracket: }')
     check_failure('{]test', 2,
@@ -105,10 +104,6 @@ describe('json_decode_string()', function()
     check_failure('"\194"test', 3, 'E474: Only UTF-8 strings allowed: \194"')
     check_failure('"\252\144\128\128\128\128"test', 8, 'E474: Only UTF-8 code points up to U+10FFFF are allowed to appear unescaped: \252\144\128\128\128\128"')
     check_failure('"test', 1, 'E474: Expected string end: "')
-    decode.p_enc = to_cstr('latin1')
-    check_failure('"\\uABCD"test', 8,
-                  'E474: Failed to convert string "ꯍ" from UTF-8')
-    decode.p_enc = saved_p_enc
     check_failure('-test', 1, 'E474: Missing number after minus sign: -')
     check_failure('-1.test', 3, 'E474: Missing number after decimal dot: -1.')
     check_failure('-1.0etest', 5, 'E474: Missing exponent: -1.0e')
diff --git a/test/unit/eval/helpers.lua b/test/unit/eval/helpers.lua
index fa76113756..5bc482216e 100644
--- a/test/unit/eval/helpers.lua
+++ b/test/unit/eval/helpers.lua
@@ -468,7 +468,7 @@ local function tbl2callback(tbl)
                                    data={funcref=eval.xstrdup(tbl.fref)}}})
   elseif tbl.type == 'pt' then
     local pt = ffi.gc(ffi.cast('partial_T*',
-        eval.xcalloc(1, ffi.sizeof('partial_T'))), eval.partial_unref)
+        eval.xcalloc(1, ffi.sizeof('partial_T'))), nil)
     ret = ffi.new('Callback[1]', {{type=eval.kCallbackPartial,
                                    data={partial=populate_partial(pt, tbl.pt, {})}}})
   else
diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index 258b5c4c1f..a1edfcfb7c 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -47,6 +47,15 @@ local lib = cimport('./src/nvim/eval/typval.h', './src/nvim/memory.h',
                     './src/nvim/eval.h', './src/nvim/vim.h',
                     './src/nvim/globals.h')
 
+local function vimconv_alloc()
+  return ffi.gc(
+    ffi.cast('vimconv_T*', lib.xcalloc(1, ffi.sizeof('vimconv_T'))),
+    function(vc)
+      lib.convert_setup(vc, nil, nil)
+      lib.xfree(vc)
+    end)
+end
+
 local function list_watch_alloc(li)
   return ffi.cast('listwatch_T*', ffi.new('listwatch_T[1]', {{lw_item=li}}))
 end
@@ -237,24 +246,33 @@ describe('typval.c', function()
             list_watch(l, lis[4]),
             list_watch(l, lis[7]),
           }
+          alloc_log:check({
+            a.list(l),
+            a.li(lis[1]),
+            a.li(lis[2]),
+            a.li(lis[3]),
+            a.li(lis[4]),
+            a.li(lis[5]),
+            a.li(lis[6]),
+            a.li(lis[7]),
+          })
 
           lib.tv_list_item_remove(l, lis[4])
-          ffi.gc(lis[4], lib.tv_list_item_free)
+          alloc_log:check({a.freed(lis[4])})
           eq({lis[1], lis[5], lis[7]}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item})
 
           lib.tv_list_item_remove(l, lis[2])
-          ffi.gc(lis[2], lib.tv_list_item_free)
+          alloc_log:check({a.freed(lis[2])})
           eq({lis[1], lis[5], lis[7]}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item})
 
           lib.tv_list_item_remove(l, lis[7])
-          ffi.gc(lis[7], lib.tv_list_item_free)
+          alloc_log:check({a.freed(lis[7])})
           eq({lis[1], lis[5], nil}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item == nil and nil})
 
           lib.tv_list_item_remove(l, lis[1])
-          ffi.gc(lis[1], lib.tv_list_item_free)
+          alloc_log:check({a.freed(lis[1])})
           eq({lis[3], lis[5], nil}, {lws[1].lw_item, lws[2].lw_item, lws[3].lw_item == nil and nil})
 
-          alloc_log:clear()
           lib.tv_list_watch_remove(l, lws[2])
           lib.tv_list_watch_remove(l, lws[3])
           lib.tv_list_watch_remove(l, lws[1])
@@ -460,6 +478,10 @@ describe('typval.c', function()
         eq(empty_list, typvalt2lua(l_tv))
         eq({true, true, true}, {lws[1].lw_item == nil, lws[2].lw_item == nil, lws[3].lw_item == nil})
 
+        lib.tv_list_watch_remove(l, lws[1])
+        lib.tv_list_watch_remove(l, lws[2])
+        lib.tv_list_watch_remove(l, lws[3])
+
         alloc_log:check({})
       end)
     end)
@@ -730,10 +752,8 @@ describe('typval.c', function()
         collectgarbage()
       end)
       itp('copies list correctly and converts items', function()
-        local vc = ffi.gc(ffi.new('vimconv_T[1]'), function(vc)
-          lib.convert_setup(vc, nil, nil)
-        end)
-        -- UTF-8 ↔ latin1 conversions need no iconv
+        local vc = vimconv_alloc()
+        -- UTF-8 ↔ latin1 conversions needs no iconv
         eq(OK, lib.convert_setup(vc, to_cstr('utf-8'), to_cstr('latin1')))
 
         local v = {{['«']='»'}, {'„'}, 1, '“', null_string, null_list, null_dict}
@@ -1087,12 +1107,16 @@ describe('typval.c', function()
       end)
     end)
     describe('join()', function()
-      local function list_join(l, sep, ret)
+      local function list_join(l, sep, join_ret)
         local ga = ga_alloc()
-        eq(ret or OK, lib.tv_list_join(ga, l, sep))
-        if ga.ga_data == nil then return ''
-        else return ffi.string(ga.ga_data)
+        eq(join_ret or OK, lib.tv_list_join(ga, l, sep))
+        local ret = ''
+        if ga.ga_data ~= nil then
+          ret = ffi.string(ga.ga_data)
         end
+        -- For some reason this is not working well in GC
+        lib.ga_clear(ffi.gc(ga, nil))
+        return ret
       end
       itp('works', function()
         local l
@@ -1508,7 +1532,7 @@ describe('typval.c', function()
           eq(s:sub(1, len), ffi.string(di.di_key))
           alloc_log:check({a.di(di, len)})
           if tv then
-            di.di_tv = tv
+            di.di_tv = ffi.gc(tv, nil)
           else
             di.di_tv.v_type = lib.VAR_UNKNOWN
           end
@@ -1539,7 +1563,7 @@ describe('typval.c', function()
           alloc_log:check({a.dict(d)})
           local di = ffi.gc(lib.tv_dict_item_alloc(''), nil)
           local tv = lua2typvalt('test')
-          di.di_tv = tv
+          di.di_tv = ffi.gc(tv, nil)
           alloc_log:check({a.di(di, ''), a.str(tv.vval.v_string, 'test')})
           eq(OK, lib.tv_dict_add(d, di))
           alloc_log:check({})
@@ -2131,9 +2155,7 @@ describe('typval.c', function()
         collectgarbage()
       end)
       itp('copies dict correctly and converts items', function()
-        local vc = ffi.gc(ffi.new('vimconv_T[1]'), function(vc)
-          lib.convert_setup(vc, nil, nil)
-        end)
+        local vc = vimconv_alloc()
         -- UTF-8 ↔ latin1 conversions need no iconv
         eq(OK, lib.convert_setup(vc, to_cstr('utf-8'), to_cstr('latin1')))
 
@@ -2659,7 +2681,8 @@ describe('typval.c', function()
             {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarFalse}, nil, 0},
             {lib.VAR_UNKNOWN, nil, 'E685: Internal error: tv_get_number(UNKNOWN)', 0},
           }) do
-            local tv = typvalt(v[1], v[2])
+            -- Using to_cstr, cannot free with tv_clear
+            local tv = ffi.gc(typvalt(v[1], v[2]), nil)
             alloc_log:check({})
             local emsg = v[3]
             local ret = v[4]
@@ -2687,7 +2710,8 @@ describe('typval.c', function()
             {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarFalse}, nil, 0},
             {lib.VAR_UNKNOWN, nil, 'E685: Internal error: tv_get_number(UNKNOWN)', 0},
           }) do
-            local tv = typvalt(v[1], v[2])
+            -- Using to_cstr, cannot free with tv_clear
+            local tv = ffi.gc(typvalt(v[1], v[2]), nil)
             alloc_log:check({})
             local emsg = v[3]
             local ret = {v[4], not not emsg}
@@ -2721,7 +2745,8 @@ describe('typval.c', function()
             {lib.VAR_UNKNOWN, nil, 'E685: Internal error: tv_get_number(UNKNOWN)', -1},
           }) do
             lib.curwin.w_cursor.lnum = 46
-            local tv = typvalt(v[1], v[2])
+            -- Using to_cstr, cannot free with tv_clear
+            local tv = ffi.gc(typvalt(v[1], v[2]), nil)
             alloc_log:check({})
             local emsg = v[3]
             local ret = v[4]
@@ -2749,7 +2774,8 @@ describe('typval.c', function()
             {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarFalse}, 'E907: Using a special value as a Float', 0},
             {lib.VAR_UNKNOWN, nil, 'E685: Internal error: tv_get_float(UNKNOWN)', 0},
           }) do
-            local tv = typvalt(v[1], v[2])
+            -- Using to_cstr, cannot free with tv_clear
+            local tv = ffi.gc(typvalt(v[1], v[2]), nil)
             alloc_log:check({})
             local emsg = v[3]
             local ret = v[4]
@@ -2780,7 +2806,9 @@ describe('typval.c', function()
             {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarFalse}, nil, 'false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', ''},
           }) do
-            local tv = typvalt(v[1], v[2])
+            -- Using to_cstr in place of Neovim allocated string, cannot
+            -- tv_clear() that.
+            local tv = ffi.gc(typvalt(v[1], v[2]), nil)
             alloc_log:check({})
             local emsg = v[3]
             local ret = v[4]
@@ -2821,7 +2849,8 @@ describe('typval.c', function()
             {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarFalse}, nil, 'false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', nil},
           }) do
-            local tv = typvalt(v[1], v[2])
+            -- Using to_cstr, cannot free with tv_clear
+            local tv = ffi.gc(typvalt(v[1], v[2]), nil)
             alloc_log:check({})
             local emsg = v[3]
             local ret = v[4]
@@ -2861,7 +2890,8 @@ describe('typval.c', function()
             {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarFalse}, nil, 'false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', ''},
           }) do
-            local tv = typvalt(v[1], v[2])
+            -- Using to_cstr, cannot free with tv_clear
+            local tv = ffi.gc(typvalt(v[1], v[2]), nil)
             alloc_log:check({})
             local emsg = v[3]
             local ret = v[4]
@@ -2902,7 +2932,8 @@ describe('typval.c', function()
             {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarFalse}, nil, 'false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', nil},
           }) do
-            local tv = typvalt(v[1], v[2])
+            -- Using to_cstr, cannot free with tv_clear
+            local tv = ffi.gc(typvalt(v[1], v[2]), nil)
             alloc_log:check({})
             local emsg = v[3]
             local ret = v[4]
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 74f214a231..4b9f185156 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -632,8 +632,9 @@ local function itp_child(wr, func)
   collectgarbage('stop')
   child_sethook(wr)
   local err, emsg = pcall(func)
-  debug.sethook()
   collectgarbage('restart')
+  collectgarbage()
+  debug.sethook()
   emsg = tostring(emsg)
   sc.write(wr, trace_end_msg)
   if not err then
@@ -654,6 +655,7 @@ end
 
 local function check_child_err(rd)
   local trace = {}
+  local did_traceline = false
   while true do
     local traceline = sc.read(rd, hook_msglen)
     if #traceline ~= hook_msglen then
@@ -664,6 +666,7 @@ local function check_child_err(rd)
       end
     end
     if traceline == trace_end_msg then
+      did_traceline = true
       break
     end
     trace[#trace + 1] = traceline
@@ -679,6 +682,13 @@ local function check_child_err(rd)
         error = error .. trace[i]
       end
     end
+    if not did_traceline then
+      error = error .. '\nNo end of trace occurred'
+    end
+    local cc_err, cc_emsg = pcall(check_cores, Paths.test_luajit_prg, true)
+    if not cc_err then
+      error = error .. '\ncheck_cores failed: ' .. cc_emsg
+    end
     assert.just_fail(error)
   end
   if res == '+\n' then
@@ -764,11 +774,6 @@ local module = {
   child_cleanup_once = child_cleanup_once,
   sc = sc,
 }
-return function(after_each)
-  if after_each then
-    after_each(function()
-      check_cores(Paths.test_luajit_prg)
-    end)
-  end
+return function()
   return module
 end