Merge branch 'blender-v2.93-release'

2021-05-18 12:52:29 +02:00
parent f4eae747f9 53376ec7fc
commit eaf3160f13
1 changed files with 11 additions and 8 deletions
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -240,14 +240,17 @@ add_blender_test(
  --run-all-tests
 )

-if(WITH_MOD_OCEANSIM)
-  add_blender_test(
-    physics_ocean
-    ${TEST_SRC_DIR}/physics/ocean_test.blend
-    --python ${TEST_PYTHON_DIR}/physics_ocean.py
-    --
-    --run-all-tests
-  )
+# disabled on macOS arm64 until updated & working
+if(NOT (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")))
+  if(WITH_MOD_OCEANSIM)
+    add_blender_test(
+      physics_ocean
+      ${TEST_SRC_DIR}/physics/ocean_test.blend
+      --python ${TEST_PYTHON_DIR}/physics_ocean.py
+      --
+      --run-all-tests
+    )
+  endif()
 endif()