diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-14 08:04:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-14 08:04:07 +0300 |
| commit | 88bd994a370436bc659fa8a9cd226744aec32706 (patch) | |
| tree | ad912651ce3f67625dd864258447d83555f2bd6f /tests | |
| parent | 769c9a2363ed7dae5fceeea1f94e685482719901 (diff) | |
| parent | b48815a9b75708d158cf7931357904ac8f6b189a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/gtests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/python/CMakeLists.txt | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 64326f34377..3ffd9db74e5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,6 @@ # Python CTests -if(WITH_BLENDER) +if(WITH_BLENDER AND WITH_PYTHON) add_subdirectory(python) endif() diff --git a/tests/gtests/CMakeLists.txt b/tests/gtests/CMakeLists.txt index 781da7bf452..3ab64d87309 100644 --- a/tests/gtests/CMakeLists.txt +++ b/tests/gtests/CMakeLists.txt @@ -2,7 +2,7 @@ # GTest if(WITH_GTESTS) - Include(GTestTesting) + include(GTestTesting) add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index dff7c352a32..79031824b83 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -116,21 +116,21 @@ add_test( # ------------------------------------------------------------------------------ # MODELING TESTS add_test( - NAME bevel + NAME bmesh_bevel COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} ${TEST_SRC_DIR}/modeling/bevel_regression.blend --python-text run_tests ) add_test( - NAME boolean + NAME bmesh_boolean COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} ${TEST_SRC_DIR}/modeling/bool_regression.blend --python-text run_tests ) add_test( - NAME split_faces + NAME bmesh_split_faces COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} ${TEST_SRC_DIR}/modeling/split_faces_test.blend --python-text run_tests @@ -139,7 +139,7 @@ add_test( # ------------------------------------------------------------------------------ # MODIFIERS TESTS add_test( - NAME modifier_array + NAME object_modifier_array COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} ${TEST_SRC_DIR}/modifier_stack/array_test.blend --python-text run_tests |