From de21ddf821ce073031aa0154874cebcfad7cb481 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 30 Jul 2020 11:12:13 +0200 Subject: BLI: Initial implementation of generic session UUID API Covers basics like generation of new UUID. Also contains code needed to use the SessionUUID as a key in the Map. --- source/blender/blenlib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/blenlib/CMakeLists.txt') diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index c6e04d4147a..d7b279c9bbf 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -110,6 +110,7 @@ set(SRC intern/rct.c intern/scanfill.c intern/scanfill_utils.c + intern/session_uuid.c intern/smallhash.c intern/sort.c intern/sort_utils.c @@ -239,6 +240,7 @@ set(SRC BLI_rect.h BLI_resource_collector.hh BLI_scanfill.h + BLI_session_uuid.h BLI_set.hh BLI_set_slots.hh BLI_smallhash.h -- cgit v1.2.3 From ba20da7214e0a71e843b0a6a8b11e0173599a0f0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 6 Aug 2020 20:17:44 +1000 Subject: Cleanup: avoid debug-only includes for BLI_assert.h Having includes in debug builds makes it possible to accidentally break release builds. Avoid this by moving calls to other modules out of BLI_assert.h into BLI_assert.c --- source/blender/blenlib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/blenlib/CMakeLists.txt') diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index d7b279c9bbf..9703c78e19c 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -37,6 +37,7 @@ set(INC_SYS set(SRC intern/BLI_args.c intern/BLI_array.c + intern/BLI_assert.c intern/BLI_dial_2d.c intern/BLI_dynstr.c intern/BLI_filelist.c -- cgit v1.2.3 From 53d203dea8230da4e80f3cc61468a4e24ff6759c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 7 Aug 2020 16:43:42 +0200 Subject: Tests: move remaining gtests into their own module folders And make them part of the blender_test runner. The one exception is blenlib performance tests, which we don't want to run by default. They remain in their own executable. Differential Revision: https://developer.blender.org/D8498 --- source/blender/blenlib/CMakeLists.txt | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'source/blender/blenlib/CMakeLists.txt') diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index a5af517ecca..819c74b6946 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -347,26 +347,58 @@ blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") if(WITH_GTESTS) set(TEST_SRC + tests/BLI_array_store_test.cc tests/BLI_array_test.cc + tests/BLI_array_utils_test.cc + tests/BLI_delaunay_2d_test.cc tests/BLI_disjoint_set_test.cc tests/BLI_edgehash_test.cc + tests/BLI_expr_pylike_eval_test.cc + tests/BLI_ghash_test.cc + tests/BLI_hash_mm2a_test.cc + tests/BLI_heap_simple_test.cc + tests/BLI_heap_test.cc tests/BLI_index_mask_test.cc tests/BLI_index_range_test.cc + tests/BLI_kdopbvh_test.cc tests/BLI_linear_allocator_test.cc + tests/BLI_linklist_lockfree_test.cc + tests/BLI_listbase_test.cc tests/BLI_map_test.cc tests/BLI_math_base_safe_test.cc + tests/BLI_math_base_test.cc + tests/BLI_math_bits_test.cc + tests/BLI_math_color_test.cc + tests/BLI_math_geom_test.cc + tests/BLI_math_matrix_test.cc + tests/BLI_math_vector_test.cc + tests/BLI_memiter_test.cc tests/BLI_memory_utils_test.cc tests/BLI_multi_value_map_test.cc + tests/BLI_path_util_test.cc + tests/BLI_polyfill_2d_test.cc + tests/BLI_ressource_strings.h + tests/BLI_session_uuid_test.cc tests/BLI_set_test.cc tests/BLI_span_test.cc tests/BLI_stack_cxx_test.cc + tests/BLI_stack_test.cc tests/BLI_string_ref_test.cc + tests/BLI_string_test.cc + tests/BLI_string_utf8_test.cc + tests/BLI_task_graph_test.cc + tests/BLI_task_test.cc tests/BLI_vector_set_test.cc tests/BLI_vector_test.cc ) + set(TEST_INC + ../imbuf + ) set(TEST_LIB bf_blenlib ) include(GTestTesting) - blender_add_test_lib(bf_bli_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}") + blender_add_test_lib(bf_blenlib_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}") + + add_subdirectory(tests/performance) endif() -- cgit v1.2.3