Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAnkit Meel <ankitjmeel@gmail.com>2020-10-14 10:02:35 +0300
committerAnkit Meel <ankitjmeel@gmail.com>2020-10-14 14:23:49 +0300
commita181b156399a13fa429159112e30c8005d5e8a59 (patch)
treedc2c249cd6ad9f4f830dfbd41d0a4667e26fe0c3 /tests
parent5edba9b42f684bf8b99894bb6988e7f46180e12c (diff)
Tests: use environment variable for leak sanitizer
Don't override other `LSAN_OPTIONS` like suppression file set in the environment variable. Old code added in {rB38ff5064b33ccb8} and {rB5f4e99b7a2b8376} Reviewed By: brecht Differential Revision: https://developer.blender.org/D9207
Diffstat (limited to 'tests')
-rw-r--r--tests/python/CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 7bfc1154ed4..9ff44ac8fe9 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -43,7 +43,9 @@ function(add_blender_test testname)
# Don't fail tests on leaks since these often happen in external libraries
# that we can't fix.
- set_tests_properties(${testname} PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0)
+ set_tests_properties(${testname} PROPERTIES ENVIRONMENT
+ LSAN_OPTIONS=exitcode=0:$ENV{LSAN_OPTIONS}
+ )
endfunction()
# Run Python script outside Blender.
@@ -56,7 +58,9 @@ function(add_python_test testname testscript)
NAME ${testname}
COMMAND ${TEST_PYTHON_EXE} ${testscript} ${ARGN}
)
- set_tests_properties(${testname} PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0)
+ set_tests_properties(${testname} PROPERTIES ENVIRONMENT
+ LSAN_OPTIONS=exitcode=0:$ENV{LSAN_OPTIONS}
+ )
endfunction()
# ------------------------------------------------------------------------------