[Bf-blender-cvs] [079b41d] master: Remove WITH_TESTS_PERFORMANCE option.

Bastien Montagne noreply at git.blender.org
Mon Jun 29 20:29:20 CEST 2015


Commit: 079b41dd37e01099df4efcfccaf2b8f64b30e6cd
Author: Bastien Montagne
Date:   Mon Jun 29 20:26:58 2015 +0200
Branches: master
https://developer.blender.org/rB079b41dd37e01099df4efcfccaf2b8f64b30e6cd

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).

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

M	CMakeLists.txt
M	tests/gtests/blenlib/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcd9699..6216238 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 ae773a05..b4cb2b9 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")




More information about the Bf-blender-cvs mailing list