From 3fcee52aa048935bf531285693ec9ff041622828 Mon Sep 17 00:00:00 2001 From: Sergii Fesenko Date: Tue, 15 Nov 2022 13:08:53 +0200 Subject: [PATCH 1/2] tests: corocbk.lua: terminate MainLoop on exit Test fails for luajit without correct termination of main loop --- tests/corocbk.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/corocbk.lua b/tests/corocbk.lua index 5a63c1f5..a7893f65 100644 --- a/tests/corocbk.lua +++ b/tests/corocbk.lua @@ -53,6 +53,7 @@ function corocbk.rethrow() end) GLib.idle_add(GLib.PRIORITY_DEFAULT, coro) local ok, err = pcall(main_loop.run, main_loop) + main_loop:quit() checkv(ok, false, 'boolean') checkv(err, 'err', 'string') end From 1bc78ebee3524b1c1ed7e9b32bb617c0463e03c8 Mon Sep 17 00:00:00 2001 From: Sergii Fesenko Date: Tue, 6 Dec 2022 11:46:03 +0200 Subject: [PATCH 2/2] tests: corocbk.lua: use xpcall to terminate MainLoop on error --- tests/corocbk.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/corocbk.lua b/tests/corocbk.lua index a7893f65..53f1b823 100644 --- a/tests/corocbk.lua +++ b/tests/corocbk.lua @@ -52,8 +52,15 @@ function corocbk.rethrow() end)() end) GLib.idle_add(GLib.PRIORITY_DEFAULT, coro) - local ok, err = pcall(main_loop.run, main_loop) - main_loop:quit() + local ok, err = xpcall( + function() + main_loop:run() + end, + function(error) + main_loop:quit() + return error + end + ) checkv(ok, false, 'boolean') checkv(err, 'err', 'string') end