diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-02-11 16:55:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-02-11 16:55:42 +0300 |
| commit | e6f3bb984b45738e1c3e72c4f16e631569cba350 (patch) | |
| tree | 2969c1385faeb6d459c39d6df26069c4ae92a2f7 /tests | |
| parent | a71a513def202b119328035dbd68e86c2c47f7ac (diff) | |
| parent | 6ec83afb1db8a67d2a03931bfb7407c7e253718f (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/python/CMakeLists.txt | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 2ca4e27bca5..fabac659555 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -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() |