From 27e2c5ab78317fd79a50980b77fa93af42f2243d Mon Sep 17 00:00:00 2001 From: Ankit Meel Date: Fri, 29 Jan 2021 14:13:26 +0530 Subject: Tests, docs: Use sanitizer options from environment too. Don't overwrite environment variables that may contain options like suppression files, symboliser etc. It's similar to rBa181b156399a13fa429159112e30c8005d5e8a59 and rBA589d13408a60cbec34a8bc3cc798c586043743ae . For Blender Add-ons repo, see the equivalent in D9816. Reviewed By: Blendify Differential Revision: https://developer.blender.org/D9815 --- build_files/cmake/Modules/GTestTesting.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index 70f48fc33ea..0c78111eaaf 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -99,7 +99,9 @@ macro(BLENDER_SRC_GTEST_EX) # Don't fail tests on leaks since these often happen in external libraries # that we can't fix. - set_tests_properties(${TARGET_NAME} PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0) + set_tests_properties(${TARGET_NAME} PROPERTIES + ENVIRONMENT LSAN_OPTIONS=exitcode=0:$ENV{LSAN_OPTIONS} + ) endif() if(WIN32) set_target_properties(${TARGET_NAME} PROPERTIES VS_GLOBAL_VcpkgEnabled "false") -- cgit v1.2.3