mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-25 16:43:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix components_tests

Browse Source
This commit is contained in:
Evil Eye 2024-08-24 09:10:23 +02:00
parent 4529af9b7f
commit 032d506aa7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/components_tests/lua/test_async.cpp
View File

@ -14,8 +14,8 @@ namespace
void SetUp() override void SetUp() override
{ {
mLua.protectedCall([&](LuaUtil::LuaView& view) { mLua.protectedCall([&](LuaUtil::LuaView& view) {
view.sol()["callback"] = [&](sol::protected_function fn) -> LuaUtil::Callback { view.sol()["callback"] = [](sol::this_state state, sol::protected_function fn) -> LuaUtil::Callback {
sol::table hiddenData(view.sol(), sol::create); sol::table hiddenData(state, sol::create);
hiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptId{}; hiddenData[LuaUtil::ScriptsContainer::sScriptIdKey] = LuaUtil::ScriptId{};
return LuaUtil::Callback{ std::move(fn), hiddenData }; return LuaUtil::Callback{ std::move(fn), hiddenData };
}; };
@ -32,11 +32,11 @@ namespace
internal::CaptureStdout(); internal::CaptureStdout();
mLua.protectedCall([&](LuaUtil::LuaView& view) { mLua.protectedCall([&](LuaUtil::LuaView& view) {
view.sol().safe_script(R"X( view.sol().safe_script(R"X(
local s = 'test' local s = 'test'
coroutine.wrap(function() coroutine.wrap(function()
pass(callback(function(v) print(s) end)) pass(callback(function(v) print(s) end))
end)() end)()
)X"); )X");
view.sol().collect_garbage(); view.sol().collect_garbage();
mCb.call(); mCb.call();
}); });
@ -47,10 +47,10 @@ namespace
{ {
mLua.protectedCall([&](LuaUtil::LuaView& view) { mLua.protectedCall([&](LuaUtil::LuaView& view) {
view.sol().safe_script(R"X( view.sol().safe_script(R"X(
coroutine.wrap(function() coroutine.wrap(function()
pass(callback(function() error('COROUTINE CALLBACK') end)) pass(callback(function() error('COROUTINE CALLBACK') end))
end)() end)()
)X"); )X");
view.sol().collect_garbage(); view.sol().collect_garbage();
}); });
EXPECT_ERROR(mCb.call(), "COROUTINE CALLBACK"); EXPECT_ERROR(mCb.call(), "COROUTINE CALLBACK");

2
components/lua/scriptscontainer.cpp
View File

@ -46,7 +46,7 @@ namespace LuaUtil
bool ok = false; bool ok = false;
mLua.protectedCall([&](LuaView& view) { mLua.protectedCall([&](LuaView& view) {
std::optional<sol::function> onInit, onLoad; std::optional<sol::function> onInit, onLoad;
bool ok = addScript(view, scriptId, onInit, onLoad); ok = addScript(view, scriptId, onInit, onLoad);
if (ok && onInit) if (ok && onInit)
callOnInit(view, scriptId, *onInit, initData); callOnInit(view, scriptId, *onInit, initData);
}); });