diff options
author | Benoit Germain <benoit.germain@ubisoft.com> | 2025-04-15 12:00:23 +0200 |
---|---|---|
committer | Benoit Germain <benoit.germain@ubisoft.com> | 2025-04-15 12:00:23 +0200 |
commit | c0ac37c79f3d9fbc12b99541f58caaca8667182c (patch) | |
tree | e943eaff22945dd2941773f7b0ed73ce27d43cd0 /unit_tests/lane_tests.cpp | |
parent | 9cc30ff72ba25ceb3a1fdef0d8c4a6efc910d777 (diff) | |
download | lanes-c0ac37c79f3d9fbc12b99541f58caaca8667182c.tar.gz lanes-c0ac37c79f3d9fbc12b99541f58caaca8667182c.tar.bz2 lanes-c0ac37c79f3d9fbc12b99541f58caaca8667182c.zip |
Fix some tests (kinda)
* split tasking_cancelling in two
* add a timer in basic and tasking_cancelling as a temporary workaround for a deadlock in mingw ucrt64 builds
Diffstat (limited to 'unit_tests/lane_tests.cpp')
-rw-r--r-- | unit_tests/lane_tests.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unit_tests/lane_tests.cpp b/unit_tests/lane_tests.cpp index 0a392d8..1367ae5 100644 --- a/unit_tests/lane_tests.cpp +++ b/unit_tests/lane_tests.cpp | |||
@@ -332,6 +332,7 @@ MAKE_TEST_CASE(lane, cooperative_shutdown, AssertNoLuaError) | |||
332 | MAKE_TEST_CASE(lane, uncooperative_shutdown, AssertWarns) | 332 | MAKE_TEST_CASE(lane, uncooperative_shutdown, AssertWarns) |
333 | #endif // LUA_VERSION_NUM | 333 | #endif // LUA_VERSION_NUM |
334 | MAKE_TEST_CASE(lane, tasking_basic, AssertNoLuaError) | 334 | MAKE_TEST_CASE(lane, tasking_basic, AssertNoLuaError) |
335 | MAKE_TEST_CASE(lane, tasking_cancelling_with_hook, AssertNoLuaError) | ||
335 | MAKE_TEST_CASE(lane, tasking_cancelling, AssertNoLuaError) | 336 | MAKE_TEST_CASE(lane, tasking_cancelling, AssertNoLuaError) |
336 | MAKE_TEST_CASE(lane, tasking_comms_criss_cross, AssertNoLuaError) | 337 | MAKE_TEST_CASE(lane, tasking_comms_criss_cross, AssertNoLuaError) |
337 | MAKE_TEST_CASE(lane, tasking_communications, AssertNoLuaError) | 338 | MAKE_TEST_CASE(lane, tasking_communications, AssertNoLuaError) |
@@ -352,6 +353,7 @@ TEST_CASE("lanes.scripted_tests") | |||
352 | FileRunnerParam{ PUC_LUA_ONLY("lane/cooperative_shutdown"), TestType::AssertNoLuaError }, // 0 | 353 | FileRunnerParam{ PUC_LUA_ONLY("lane/cooperative_shutdown"), TestType::AssertNoLuaError }, // 0 |
353 | FileRunnerParam{ "lane/uncooperative_shutdown", TestType::AssertWarns }, | 354 | FileRunnerParam{ "lane/uncooperative_shutdown", TestType::AssertWarns }, |
354 | FileRunnerParam{ "lane/tasking_basic", TestType::AssertNoLuaError }, // 2 | 355 | FileRunnerParam{ "lane/tasking_basic", TestType::AssertNoLuaError }, // 2 |
356 | FileRunnerParam{ "lane/tasking_cancelling_with_hook", TestType::AssertNoLuaError }, // 3 | ||
355 | FileRunnerParam{ "lane/tasking_cancelling", TestType::AssertNoLuaError }, // 3 | 357 | FileRunnerParam{ "lane/tasking_cancelling", TestType::AssertNoLuaError }, // 3 |
356 | FileRunnerParam{ "lane/tasking_comms_criss_cross", TestType::AssertNoLuaError }, // 4 | 358 | FileRunnerParam{ "lane/tasking_comms_criss_cross", TestType::AssertNoLuaError }, // 4 |
357 | FileRunnerParam{ "lane/tasking_communications", TestType::AssertNoLuaError }, | 359 | FileRunnerParam{ "lane/tasking_communications", TestType::AssertNoLuaError }, |