[Bf-blender-cvs] [ae213d7] master: Don't add Cycles tests if tests folder does not exist
Sergey Sharybin
noreply at git.blender.org
Fri Jan 23 16:56:42 CET 2015
Commit: ae213d740da1416df229e06616c883d979cfd640
Author: Sergey Sharybin
Date: Fri Jan 23 20:56:03 2015 +0500
Branches: master
https://developer.blender.org/rBae213d740da1416df229e06616c883d979cfd640
Don't add Cycles tests if tests folder does not exist
Also print message about those tests being disabled.
===================================================================
M tests/python/CMakeLists.txt
===================================================================
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 59d3aa1..c366aad 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -361,12 +361,14 @@ add_test(export_fbx_all_objects ${TEST_BLENDER_EXE}
)
if(WITH_CYCLES)
- if(OPENIMAGEIO_IDIFF)
+ if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/cycles/ctests/shader")
add_test(cycles_shaders_test
${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py
-blender "${TEST_BLENDER_EXE_BARE}"
-testdir "${TEST_SRC_DIR}/cycles/ctests/shader"
-idiff "${OPENIMAGEIO_IDIFF}"
)
+ else()
+ MESSAGE(STATUS "Disabling Cycles tests because tests folder does not exist")
endif()
endif()
More information about the Bf-blender-cvs
mailing list