From ef010da315b596edde5aaf9d8d60101ca3a64373 Mon Sep 17 00:00:00 2001 From: Alaska Date: Tue, 16 Jul 2024 09:46:12 +0200 Subject: [PATCH] Cycles tests: Enable MNEE test on Metal on supported macOS version MNEE tests were disabled on Metal due to the feature not being supported in macOS < 13. This commit enables MNEE tests on Metal GPUs if they are using macOS >= 13, otherwise leave it disabled. Pull Request: https://projects.blender.org/blender/blender/pulls/124709 --- tests/python/cycles_render_tests.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/python/cycles_render_tests.py b/tests/python/cycles_render_tests.py index 059130abcf5..60cebc4d6d3 100644 --- a/tests/python/cycles_render_tests.py +++ b/tests/python/cycles_render_tests.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 import argparse +import platform import os import shlex import sys @@ -32,10 +33,16 @@ BLACKLIST_OPTIX = [ 'T43865.blend', ] -BLACKLIST_METAL = [ - # MNEE only works on Metal with macOS >= 13 - "underwater_caustics.blend", -] +BLACKLIST_METAL = [] + +if platform.system() == "Darwin": + version, _, _ = platform.mac_ver() + major_version = version.split(".")[0] + if int(major_version) < 13: + BLACKLIST_METAL += [ + # MNEE only works on Metal with macOS >= 13 + "underwater_caustics.blend", + ] BLACKLIST_GPU = [ # Uninvestigated differences with GPU.