diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-08-07 17:43:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-08-10 19:14:00 +0300 |
| commit | 53d203dea8230da4e80f3cc61468a4e24ff6759c (patch) | |
| tree | 3f1b7498fb1a3108e60a4355bec0e4eef76110e4 /source/blender/io/common | |
| parent | af77bf1f0f94cb07d5bf681d1f771d4106873780 (diff) | |
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
Diffstat (limited to 'source/blender/io/common')
| -rw-r--r-- | source/blender/io/common/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/io/common/CMakeLists.txt b/source/blender/io/common/CMakeLists.txt index d3341767f8b..7e39af32f11 100644 --- a/source/blender/io/common/CMakeLists.txt +++ b/source/blender/io/common/CMakeLists.txt @@ -55,8 +55,11 @@ if(WITH_GTESTS) intern/hierarchy_context_order_test.cc intern/object_identifier_test.cc ) + set(TEST_INC + ../../blenloader + ) set(TEST_LIB - bf_blenloader_test + bf_blenloader_tests bf_io_common ) include(GTestTesting) diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc index 2bc7560e177..cbb2e63a99f 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc @@ -17,7 +17,8 @@ * All rights reserved. */ #include "IO_abstract_hierarchy_iterator.h" -#include "blenloader/blendfile_loading_base_test.h" + +#include "tests/blendfile_loading_base_test.h" #include "BLI_math.h" #include "DEG_depsgraph.h" |