Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2015-06-29 19:15:02 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-06-29 19:15:02 +0300
commit117bcfe039c6cd3c235e6a8da064a8c283176648 (patch)
treecc7a78455108c9e3e584aa4a48e4d663a9d411ce /build_files
parenta8bc5f0cdb0217401e418355db71ea042ca552d1 (diff)
GTests: do not add 'performance' tests to auto-ran tests (with ctest or 'make test')...
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/Modules/GTestTesting.cmake16
1 files changed, 13 insertions, 3 deletions
diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake
index 6a9cae22f33..b98d15ecd41 100644
--- a/build_files/cmake/Modules/GTestTesting.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -12,7 +12,7 @@
#
#=============================================================================
-macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS)
+macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
if(WITH_GTESTS)
get_property(_current_include_directories
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -40,10 +40,20 @@ macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS)
RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}"
RUNTIME_OUTPUT_DIRECTORY_DEBUG "${TESTS_OUTPUT_DIR}"
INCLUDE_DIRECTORIES "${TEST_INC}")
- add_test(${NAME}_test ${TESTS_OUTPUT_DIR}/${NAME}_test)
+ if(${DO_ADD_TEST})
+ add_test(${NAME}_test ${TESTS_OUTPUT_DIR}/${NAME}_test)
+ endif()
endif()
endmacro()
+macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS)
+ BLENDER_SRC_GTEST_EX("${NAME}" "${SRC}" "${EXTRA_LIBS}" "TRUE")
+endmacro()
+
macro(BLENDER_TEST NAME EXTRA_LIBS)
- BLENDER_SRC_GTEST("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}")
+ BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "TRUE")
+endmacro()
+
+macro(BLENDER_TEST_PERFORMANCE NAME EXTRA_LIBS)
+ BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "FALSE")
endmacro()