[Bf-blender-cvs] [0b01b81754e] blender-v3.0-release: Tests: disable Cycles tests based on more build options
Brecht Van Lommel
noreply at git.blender.org
Tue Nov 9 13:56:18 CET 2021
Commit: 0b01b81754ec6352f290ad7c31680503bf6ab5eb
Author: Brecht Van Lommel
Date: Tue Nov 9 13:35:51 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB0b01b81754ec6352f290ad7c31680503bf6ab5eb
Tests: disable Cycles tests based on more build options
WITH_OPENCOLORIO and WITH_COMPOSITOR are required to run the tests at all,
since they affect many tests.
WITH_OPENSUBDIV WITH_FREESTYLE, WITH_OPENVDB, WITH_OPENIMAGEDENOISE and
WITH_MOD_FLUID selectively disable some tests.
===================================================================
M tests/python/CMakeLists.txt
===================================================================
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 92d46eb8d80..1927223cf32 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -630,14 +630,16 @@ endif()
if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
if(NOT OPENIMAGEIO_IDIFF)
- MESSAGE(STATUS "Disabling render tests because OIIO idiff does not exist")
+ MESSAGE(STATUS "Disabling Cycles tests because OIIO idiff does not exist")
elseif(NOT EXISTS "${TEST_SRC_DIR}/render/shader")
- MESSAGE(STATUS "Disabling render tests because tests folder does not exist at ${TEST_SRC_DIR}")
+ MESSAGE(STATUS "Disabling Cycles tests because tests folder does not exist at ${TEST_SRC_DIR}")
+ elseif(NOT WITH_COMPOSITOR)
+ MESSAGE(STATUS "Disabling Cycles tests because WITH_COMPOSITOR is disabled")
+ elseif(NOT WITH_OPENCOLORIO)
+ MESSAGE(STATUS "Disabling Cycles tests because WITH_OPENCOLORIO is disabled")
else()
set(render_tests
bsdf
- denoise
- displacement
hair
image_colorspace
image_data_types
@@ -646,20 +648,38 @@ if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
integrator
light
mesh
- motion_blur
- openvdb
- render_layer
- reports
shader
shadow_catcher
sss
volume
)
+ if(WITH_OPENSUBDIV)
+ list(APPEND render_tests displacement)
+ endif()
+
+ if(WITH_FREESTYLE)
+ list(APPEND render_tests render_layer)
+ endif()
+
+ if(WITH_MOD_FLUID)
+ list(APPEND render_tests motion_blur reports)
+ endif()
+
+ if(WITH_OPENVDB)
+ list(APPEND render_tests openvdb)
+ endif()
+
+ if(WITH_OPENIMAGEDENOISE)
+ list(APPEND render_tests denoise)
+ endif()
+
if(WITH_OPENGL_RENDER_TESTS)
list(APPEND render_tests grease_pencil)
endif()
+ list(SORT render_tests)
+
# Cycles
if(WITH_CYCLES)
if(NOT WITH_CYCLES_OSL)
More information about the Bf-blender-cvs
mailing list