diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-28 18:52:47 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-28 18:52:47 +0300 |
| commit | 278d9c83229470abcedda42cac06a9784f2ed8f3 (patch) | |
| tree | 6df04df8ecef4c97605977948805d0ebc81adcd1 /tests/gtests | |
| parent | 6fd5f95ca111543ccd37da118551a2b4d94dfdb7 (diff) | |
| parent | c16321cb9dc983d174e7f5888d66118ef5f76a92 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blenderplayer/CMakeLists.txt
tests/gtests/blenlib/CMakeLists.txt
Diffstat (limited to 'tests/gtests')
| -rw-r--r-- | tests/gtests/blenlib/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt index e652fbecb36..e399d4651f5 100644 --- a/tests/gtests/blenlib/CMakeLists.txt +++ b/tests/gtests/blenlib/CMakeLists.txt @@ -48,8 +48,8 @@ BLENDER_TEST(BLI_ghash "bf_blenlib") BLENDER_TEST(BLI_hash_mm2a "bf_blenlib") BLENDER_TEST(BLI_heap "bf_blenlib") BLENDER_TEST(BLI_heap_simple "bf_blenlib") -BLENDER_TEST(BLI_kdopbvh "bf_blenlib") -BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib") +BLENDER_TEST(BLI_kdopbvh "bf_blenlib;bf_intern_numaapi") +BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib;bf_intern_numaapi") BLENDER_TEST(BLI_listbase "bf_blenlib") BLENDER_TEST(BLI_math_base "bf_blenlib") BLENDER_TEST(BLI_math_color "bf_blenlib") @@ -60,7 +60,7 @@ BLENDER_TEST(BLI_polyfill_2d "bf_blenlib") BLENDER_TEST(BLI_stack "bf_blenlib") BLENDER_TEST(BLI_string "bf_blenlib") BLENDER_TEST(BLI_string_utf8 "bf_blenlib") -BLENDER_TEST(BLI_task "bf_blenlib") +BLENDER_TEST(BLI_task "bf_blenlib;bf_intern_numaapi") BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib") |