From ec9ab00fcb6fa7bc2f2bcb7a11daadc527f83f41 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Wed, 5 Aug 2020 12:13:35 +0200
Subject: Fix failing USD test on macOS after becoming part of blender test
 runner

---
 tests/gtests/runner/CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'tests/gtests')

diff --git a/tests/gtests/runner/CMakeLists.txt b/tests/gtests/runner/CMakeLists.txt
index 4153567ff42..8b3390e7aec 100644
--- a/tests/gtests/runner/CMakeLists.txt
+++ b/tests/gtests/runner/CMakeLists.txt
@@ -83,6 +83,12 @@ set(_GOOGLETEST_DISCOVER_TESTS_SCRIPT
   ${CMAKE_SOURCE_DIR}/build_files/cmake/Modules/GTestAddTests.cmake
 )
 
+if(APPLE)
+  set(_test_release_dir ${TEST_INSTALL_DIR}/Blender.app/Contents/Resources/${BLENDER_VERSION})
+else()
+  set(_test_release_dir ${TEST_INSTALL_DIR}/${BLENDER_VERSION})
+endif()
+
 gtest_discover_tests(blender_test
   WORKING_DIRECTORY "${TEST_INSTALL_DIR}"
 # So that it will run after the install phase that will copy the required libraries
@@ -90,5 +96,7 @@ gtest_discover_tests(blender_test
 # So that unit tests know where to find files:
   EXTRA_ARGS
     --test-assets-dir "${CMAKE_SOURCE_DIR}/../lib/tests"
-    --test-release-dir "${TEST_INSTALL_DIR}/${BLENDER_VERSION}"
+    --test-release-dir "${_test_release_dir}"
 )
+
+unset(_test_release_dir)
-- 
cgit v1.2.3