[Bf-blender-cvs] [f1839a872bd] experimental-build: Attempt to investigate potential issue in tests on Windows.
Bastien Montagne
noreply at git.blender.org
Thu May 20 17:51:28 CEST 2021
Commit: f1839a872bd3d6a104982ae9ee083d4abcce35f5
Author: Bastien Montagne
Date: Thu May 20 17:50:59 2021 +0200
Branches: experimental-build
https://developer.blender.org/rBf1839a872bd3d6a104982ae9ee083d4abcce35f5
Attempt to investigate potential issue in tests on Windows.
===================================================================
M source/blender/blenkernel/intern/lib_id_test.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_id_test.cc b/source/blender/blenkernel/intern/lib_id_test.cc
index 9bfd19ae4d6..8c23618a20a 100644
--- a/source/blender/blenkernel/intern/lib_id_test.cc
+++ b/source/blender/blenkernel/intern/lib_id_test.cc
@@ -45,6 +45,7 @@ static void test_lib_id_main_sort_free(LibIDMainSortTestContext *ctx)
BKE_main_free(ctx->bmain);
}
+#if 0
static void test_lib_id_main_sort_check_order(std::initializer_list<ID *> list)
{
ID *prev_id = nullptr;
@@ -57,6 +58,17 @@ static void test_lib_id_main_sort_check_order(std::initializer_list<ID *> list)
}
EXPECT_EQ(prev_id->next, nullptr);
}
+#else
+static void test_lib_id_main_sort_check_order(ID *id_a, ID *id_b, ID *id_c)
+{
+ EXPECT_EQ(id_a->prev, nullptr);
+ EXPECT_EQ(id_a->next, id_b);
+ EXPECT_EQ(id_b->prev, id_a);
+ EXPECT_EQ(id_b->next, id_c);
+ EXPECT_EQ(id_c->prev, id_b);
+ EXPECT_EQ(id_c->next, nullptr);
+}
+#endif
TEST(lib_id_main_sort, local_ids_1)
{
@@ -69,7 +81,7 @@ TEST(lib_id_main_sort, local_ids_1)
ID *id_b = static_cast<ID *>(BKE_id_new(ctx.bmain, ID_OB, "OB_B"));
EXPECT_TRUE(ctx.bmain->objects.first == id_a);
EXPECT_TRUE(ctx.bmain->objects.last == id_c);
- test_lib_id_main_sort_check_order({id_a, id_b, id_c});
+ test_lib_id_main_sort_check_order(id_a, id_b, id_c);
test_lib_id_main_sort_free(&ctx);
}
@@ -92,19 +104,19 @@ TEST(lib_id_main_sort, linked_ids_1)
id_sort_by_name(&ctx.bmain->objects, id_b, nullptr);
EXPECT_TRUE(ctx.bmain->objects.first == id_c);
EXPECT_TRUE(ctx.bmain->objects.last == id_b);
- test_lib_id_main_sort_check_order({id_c, id_a, id_b});
+ test_lib_id_main_sort_check_order(id_c, id_a, id_b);
id_a->lib = lib_b;
id_sort_by_name(&ctx.bmain->objects, id_a, nullptr);
EXPECT_TRUE(ctx.bmain->objects.first == id_c);
EXPECT_TRUE(ctx.bmain->objects.last == id_a);
- test_lib_id_main_sort_check_order({id_c, id_b, id_a});
+ test_lib_id_main_sort_check_order(id_c, id_b, id_a);
id_b->lib = lib_b;
id_sort_by_name(&ctx.bmain->objects, id_b, nullptr);
EXPECT_TRUE(ctx.bmain->objects.first == id_c);
EXPECT_TRUE(ctx.bmain->objects.last == id_b);
- test_lib_id_main_sort_check_order({id_c, id_a, id_b});
+ test_lib_id_main_sort_check_order(id_c, id_a, id_b);
test_lib_id_main_sort_free(&ctx);
}
More information about the Bf-blender-cvs
mailing list