Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: Expose the previously private gears.protect_call error handlers. 

This will allow the test suits to intercept them instead of adding more
and more exceptions to `run.sh`.
This commit is contained in:
Emmanuel Lepage Vallee 2019-07-22 00:22:20 -04:00
parent 423aeebe8a
commit c0ef0c8802
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gears/protected_call.lua
View File

@ -12,11 +12,11 @@ local xpcall = xpcall
local protected_call = {} local protected_call = {}
local function error_handler(err) function protected_call._error_handler(err)
gdebug.print_error(traceback("Error during a protected call: " .. tostring(err), 2)) gdebug.print_error(traceback("Error during a protected call: " .. tostring(err), 2))
end end
local function handle_result(success, ...) function protected_call._handle_result(success, ...)
if success then if success then
return ... return ...
end end
@ -27,13 +27,13 @@ if not select(2, xpcall(function(a) return a end, error, true)) then
-- Lua 5.1 doesn't support arguments in xpcall :-( -- Lua 5.1 doesn't support arguments in xpcall :-(
do_pcall = function(func, ...) do_pcall = function(func, ...)
local args = { ... } local args = { ... }
return handle_result(xpcall(function() return protected_call._handle_result(xpcall(function()
return func(unpack(args)) return func(unpack(args))
end, error_handler)) end, protected_call._error_handler))
end end
else else
do_pcall = function(func, ...) do_pcall = function(func, ...)
return handle_result(xpcall(func, error_handler, ...)) return protected_call._handle_result(xpcall(func, protected_call._error_handler, ...))
end end
end end