unittests: Move checking cores to check_child_err

This commit is contained in:
ZyX
2017-04-06 08:23:33 +03:00
parent 654dd15bb8
commit a83511d1a1
2 changed files with 12 additions and 8 deletions

View File

@@ -655,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
@@ -665,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
@@ -680,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
@@ -765,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