griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v3.1-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2022-02-11 14:55:42 +01:00
parent a71a513def 6ec83afb1d
commit e6f3bb984b
4 changed files with 155 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/python/CMakeLists.txt
View File

@@ -683,19 +683,16 @@ if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
set(_cycles_render_tests bake;${render_tests};osl)
foreach(render_test ${_cycles_render_tests})
# Enable just one simple test for Metal until more tests are passing.
if((NOT (_cycles_device MATCHES "METAL")) OR (render_test MATCHES "camera"))
add_python_test(
cycles_${render_test}_${_cycles_device_lower}
${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py
-blender "${TEST_BLENDER_EXE}"
-testdir "${TEST_SRC_DIR}/render/${render_test}"
-idiff "${OPENIMAGEIO_IDIFF}"
-outdir "${TEST_OUT_DIR}/cycles"
-device ${_cycles_device}
-blacklist ${_cycles_blacklist}
)
endif()
add_python_test(
cycles_${render_test}_${_cycles_device_lower}
${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py
-blender "${TEST_BLENDER_EXE}"
-testdir "${TEST_SRC_DIR}/render/${render_test}"
-idiff "${OPENIMAGEIO_IDIFF}"
-outdir "${TEST_OUT_DIR}/cycles"
-device ${_cycles_device}
-blacklist ${_cycles_blacklist}
)
endforeach()
endforeach()
endif()