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 21:26:58 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-06-29 21:26:58 +0300
commit079b41dd37e01099df4efcfccaf2b8f64b30e6cd (patch)
tree2db04d95d053a0450ff6672b246147074572fb06
parent117bcfe039c6cd3c235e6a8da064a8c283176648 (diff)
Remove WITH_TESTS_PERFORMANCE option.
Performance tests now have their own CMake macro, which ensures they do not get added to ctest list, so we do not have to bother about them anymore, and can always build them (when GTests are enabled, of course).
-rw-r--r--CMakeLists.txt1
-rw-r--r--tests/gtests/blenlib/CMakeLists.txt4
2 files changed, 1 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcd9699aef3..62162388b35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -395,7 +395,6 @@ option(WITH_BOOST "Enable features depending on boost" ON)
# Unit testsing
option(WITH_GTESTS "Enable GTest unit testing" OFF)
-option(WITH_TESTS_PERFORMANCE "Enable performance tests" OFF)
# Documentation
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index ae773a05e8d..b4cb2b9d0ea 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -45,6 +45,4 @@ BLENDER_TEST(BLI_listbase "bf_blenlib")
BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
BLENDER_TEST(BLI_ghash "bf_blenlib")
-if(WITH_TESTS_PERFORMANCE)
- BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib")
-endif()
+BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib")