[Bf-blender-cvs] [42e4279] master: CMake: Move performance tests under the cmake option

Sergey Sharybin noreply at git.blender.org
Mon Apr 20 15:31:12 CEST 2015


Commit: 42e427905cd77dc5e8d805b121c754e1be54737f
Author: Sergey Sharybin
Date:   Mon Apr 20 18:30:26 2015 +0500
Branches: master
https://developer.blender.org/rB42e427905cd77dc5e8d805b121c754e1be54737f

CMake: Move performance tests under the cmake option

This way running full sweep of regression tests does not require
waiting for the performance test to finish.

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

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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03b7f22..cd37aa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -395,6 +395,7 @@ 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 152b656..20b8760 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -45,4 +45,6 @@ BLENDER_TEST(BLI_listbase "bf_blenlib")
 BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
 BLENDER_TEST(BLI_ghash "bf_blenlib")
 
-BLENDER_TEST(BLI_ghash_performance "bf_blenlib")
+if(WITH_TESTS_PERFORMANCE)
+	BLENDER_TEST(BLI_ghash_performance "bf_blenlib")
+endif()




More information about the Bf-blender-cvs mailing list