[Bf-blender-cvs] [b48815a9b75] master: Cleanup: use prefix for tests

[Campbell Barton]

Commit: b48815a9b75708d158cf7931357904ac8f6b189a
Author: Campbell Barton
Date:   Wed Feb 14 16:02:21 2018 +1100
Branches: master
https://developer.blender.org/rBb48815a9b75708d158cf7931357904ac8f6b189a

Cleanup: use prefix for tests

Allows for running all `bmesh_*` or `object_*` tests.

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

M	tests/CMakeLists.txt
M	tests/gtests/CMakeLists.txt
M	tests/python/CMakeLists.txt

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

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 853af147413..662a35558b7 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