Merge remote-tracking branch 'nulltoken/topic/oid-generation' into development

Conflicts:
	tests-clay/clay.h
	tests-clay/clay_main.c

1 files changed, 11 insertions, 2 deletions

diff --git a/tests-clay/clay_main.c b/tests-clay/clay_main.c
index b8fde2045..93e15f405 100644
--- a/tests-clay/clay_main.c
+++ b/tests-clay/clay_main.c
@@ -246,6 +246,9 @@ static const struct clay_func _clay_cb_object_raw_type2string[] = {
 	{"convert_string_to_type", &test_object_raw_type2string__convert_string_to_type},
 	{"convert_type_to_string", &test_object_raw_type2string__convert_type_to_string}
 };
+static const struct clay_func _clay_cb_object_tree_buildfromindex[] = {
+    {"generate_predictable_object_ids", &test_object_tree_buildfromindex__generate_predictable_object_ids}
+};
 static const struct clay_func _clay_cb_object_tree_diff[] = {
     {"addition", &test_object_tree_diff__addition},
 	{"deletion", &test_object_tree_diff__deletion},
@@ -445,6 +448,12 @@ static const struct clay_suite _clay_suites[] = {
         _clay_cb_object_raw_type2string, 3
     },
 	{
+        "object::tree::buildfromindex",
+        {"initialize", &test_object_tree_buildfromindex__initialize},
+        {"cleanup", &test_object_tree_buildfromindex__cleanup},
+        _clay_cb_object_tree_buildfromindex, 1
+    },
+	{
         "object::tree::diff",
         {"initialize", &test_object_tree_diff__initialize},
         {"cleanup", &test_object_tree_diff__cleanup},
@@ -506,8 +515,8 @@ static const struct clay_suite _clay_suites[] = {
     }
 };
 
-static size_t _clay_suite_count = 35;
-static size_t _clay_callback_count = 118;
+static size_t _clay_suite_count = 36;
+static size_t _clay_callback_count = 119;
 
 /* Core test functions */
 static void