unittests: Replace two environment variables with one TRACE_LEVEL

1 files changed, 16 insertions, 5 deletions

diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 2cea88c8c0..93e1e91173 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -539,10 +539,16 @@ local tracehelp = dedent([[
 ]])
 
 local function child_sethook(wr)
-  if os.getenv('NVIM_TEST_NO_TRACE') == '1' then
+  local trace_level = os.getenv('NVIM_TEST_TRACE_LEVEL')
+  if not trace_level or trace_level == '' then
+    trace_level = 1
+  else
+    trace_level = tonumber(trace_level)
+  end
+  if trace_level <= 0 then
     return
   end
-  local trace_only_c = (os.getenv('NVIM_TEST_TRACE_EVERYTHING') ~= '1')
+  local trace_only_c = trace_level <= 1
   local function hook(reason, lnum)
     local info = nil
     if reason ~= 'tail return' then  -- tail return
@@ -651,9 +657,14 @@ local function check_child_err(rd)
   end
   local res = sc.read(rd, 2)
   if #res ~= 2 then
-    local error = '\nTest crashed, trace:\n' .. tracehelp
-    for i = 1, #trace do
-      error = error .. trace[i]
+    local error
+    if #trace == 0 then
+      error = '\nTest crashed, no trace available\n'
+    else
+      error = '\nTest crashed, trace:\n' .. tracehelp
+      for i = 1, #trace do
+        error = error .. trace[i]
+      end
     end
     assert.just_fail(error)
   end