Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Parborg <zeddb>2021-01-14 14:24:24 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-01-14 15:14:43 +0300
commit74f6b81c12c3c137a05eb0051d75821c11a30c11 (patch)
treef47929a4b7ddabd67b12b69ae369efd68b66d17a /tests/python/cycles_render_tests.py
parent4e90266fd8c06214f2dfc2c84d4be8f8c24c532f (diff)
Tests: skip OSL render tests in build without OSL
Differential Revision: https://developer.blender.org/D9990
Diffstat (limited to 'tests/python/cycles_render_tests.py')
-rw-r--r--tests/python/cycles_render_tests.py2
1 files changed, 2 insertions, 0 deletions
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