[Bf-blender-cvs] [74f6b81c12c] blender-v2.92-release: Tests: skip OSL render tests in build without OSL

[Sebastian Parborg]

Commit: 74f6b81c12c3c137a05eb0051d75821c11a30c11
Author: Sebastian Parborg
Date:   Thu Jan 14 12:24:24 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB74f6b81c12c3c137a05eb0051d75821c11a30c11

Tests: skip OSL render tests in build without OSL

Differential Revision: https://developer.blender.org/D9990

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

M	tests/python/CMakeLists.txt
M	tests/python/cycles_render_tests.py

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

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 2ca21a315e4..d8bc5be40d7 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -651,6 +651,9 @@ if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
 
     # Cycles
     if(WITH_CYCLES)
+      if(NOT WITH_CYCLES_OSL)
+        set(_cycles_blacklist OSL)
+      endif()
       foreach(_cycles_device ${CYCLES_TEST_DEVICES})
         string(TOLOWER "${_cycles_device}" _cycles_device_lower)
         set(_cycles_render_tests bake;${render_tests};osl)
@@ -664,6 +667,7 @@ if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
             -idiff "${OPENIMAGEIO_IDIFF}"
             -outdir "${TEST_OUT_DIR}/cycles"
             -device ${_cycles_device}
+            -blacklist ${_cycles_blacklist}
           )
         endforeach()
       endforeach()
diff --git a/tests/python/cycles_render_tests.py b/tests/python/cycles_render_tests.py
index 95bc874300d..36c3f7d9fe5 100644
--- a/tests/python/cycles_render_tests.py
+++ b/tests/python/cycles_render_tests.py
@@ -98,6 +98,7 @@ def create_argparse():
     parser.add_argument("-outdir", nargs=1)
     parser.add_argument("-idiff", nargs=1)
     parser.add_argument("-device", nargs=1)
+    parser.add_argument("-blacklist", nargs="*")
     return parser
 
 
@@ -114,6 +115,7 @@ def main():
     blacklist = []
     if device != 'CPU':
         blacklist += BLACKLIST_GPU
+    if device != 'CPU' or 'OSL' in args.blacklist:
         blacklist += BLACKLIST_OSL
     if device == 'OPTIX':
         blacklist += BLACKLIST_OPTIX