Commit: ec9ab00fcb6fa7bc2f2bcb7a11daadc527f83f41
Author: Brecht Van Lommel
Date: Wed Aug 5 12:13:35 2020 +0200
Branches: master
https://developer.blender.org/rBec9ab00fcb6fa7bc2f2bcb7a11daadc527f83f41
Fix failing USD test on macOS after becoming part of blender test runner
===================================================================
M tests/gtests/runner/CMakeLists.txt
===================================================================
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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
