diff options
author | Ankit Meel <ankitjmeel@gmail.com> | 2021-01-29 11:43:26 +0300 |
---|---|---|
committer | Ankit Meel <ankitjmeel@gmail.com> | 2021-01-29 11:43:26 +0300 |
commit | 27e2c5ab78317fd79a50980b77fa93af42f2243d (patch) | |
tree | 9e4e0afb6a77404c2b33fcb0a304f2f6da8b0709 /build_files/cmake/Modules | |
parent | 16fab8ebc4c786ce673b7b02e37966a1200f4605 (diff) |
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
Diffstat (limited to 'build_files/cmake/Modules')
-rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
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") |