[Bf-blender-cvs] [cabc40db811] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: cabc40db8115b45339909542b98365cf07a2d334
Author: Jacques Lucke
Date:   Thu Sep 12 14:49:38 2019 +0200
Branches: functions
https://developer.blender.org/rBcabc40db8115b45339909542b98365cf07a2d334

Merge branch 'master' into functions

===================================================================



===================================================================

diff --cc tests/gtests/blenlib/CMakeLists.txt
index 984fe59d7df,d2d7b76df6c..9810ccfd3c1
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@@ -39,15 -39,12 +39,16 @@@ else(
  endif()
  
  BLENDER_TEST(BLI_array "bf_blenlib")
+ BLENDER_TEST(BLI_array_ref "bf_blenlib")
  BLENDER_TEST(BLI_array_store "bf_blenlib")
  BLENDER_TEST(BLI_array_utils "bf_blenlib")
 +BLENDER_TEST(BLI_array_ref "bf_blenlib")
 +BLENDER_TEST(BLI_bit_array_ref "bf_blenlib")
 +BLENDER_TEST(BLI_chained_strings "bf_blenlib")
 +BLENDER_TEST(BLI_chunked_range "bf_blenlib")
  BLENDER_TEST(BLI_delaunay_2d "bf_blenlib")
- BLENDER_TEST(BLI_expr_pylike_eval "bf_blenlib")
  BLENDER_TEST(BLI_edgehash "bf_blenlib")
+ BLENDER_TEST(BLI_expr_pylike_eval "bf_blenlib")
  BLENDER_TEST(BLI_ghash "bf_blenlib")
  BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
  BLENDER_TEST(BLI_heap "bf_blenlib")
@@@ -61,24 -57,14 +62,25 @@@ BLENDER_TEST(BLI_math_base "bf_blenlib"
  BLENDER_TEST(BLI_math_color "bf_blenlib")
  BLENDER_TEST(BLI_math_geom "bf_blenlib")
  BLENDER_TEST(BLI_memiter "bf_blenlib")
 +BLENDER_TEST(BLI_multi_vector "bf_blenlib")
 +BLENDER_TEST(BLI_optional "bf_blenlib")
  BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
  BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
 +BLENDER_TEST(BLI_refcount "bf_blenlib")
 +BLENDER_TEST(BLI_vector "bf_blenlib")
 +BLENDER_TEST(BLI_set "bf_blenlib")
 +BLENDER_TEST(BLI_set_vector "bf_blenlib")
 +BLENDER_TEST(BLI_stack_cpp "bf_blenlib")
 +BLENDER_TEST(BLI_map "bf_blenlib")
 +BLENDER_TEST(BLI_multi_map "bf_blenlib")
  BLENDER_TEST(BLI_stack "bf_blenlib")
+ BLENDER_TEST(BLI_stack_cxx "bf_blenlib")
  BLENDER_TEST(BLI_string "bf_blenlib")
 +BLENDER_TEST(BLI_string_map "bf_blenlib")
 +BLENDER_TEST(BLI_string_ref "bf_blenlib")
  BLENDER_TEST(BLI_string_utf8 "bf_blenlib")
  BLENDER_TEST(BLI_task "bf_blenlib;bf_intern_numaapi")
- BLENDER_TEST(BLI_vector_adaptor "bf_blenlib")
+ BLENDER_TEST(BLI_vector "bf_blenlib")
  
  BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib")
  BLENDER_TEST_PERFORMANCE(BLI_task_performance "bf_blenlib")