summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-09 02:03:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-09 02:03:17 +0000
commit848d771ddb35416be6acee900d0936fc037b2d6e (patch)
treeb4e3b95962d0a665c722a7db5c78d7e27e8fe322
parent2a54e35ccf6c1e43eda9594d3dc203b80118a064 (diff)
parent1d70b3af1c1b8f321eba07127518a71878bce7a9 (diff)
downloadexternal_llvm-848d771ddb35416be6acee900d0936fc037b2d6e.zip
external_llvm-848d771ddb35416be6acee900d0936fc037b2d6e.tar.gz
external_llvm-848d771ddb35416be6acee900d0936fc037b2d6e.tar.bz2
am 1d70b3af: am 5a622b72: Merge "Pass LSAN_OPTIONS down so that it is possible to add suppressions."
* commit '1d70b3af1c1b8f321eba07127518a71878bce7a9': Pass LSAN_OPTIONS down so that it is possible to add suppressions.
-rw-r--r--utils/lit/lit/TestingConfig.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/lit/lit/TestingConfig.py b/utils/lit/lit/TestingConfig.py
index 4cd9486..52cebbf 100644
--- a/utils/lit/lit/TestingConfig.py
+++ b/utils/lit/lit/TestingConfig.py
@@ -23,7 +23,8 @@ class TestingConfig:
}
pass_vars = ['LIBRARY_PATH', 'LD_LIBRARY_PATH', 'SYSTEMROOT', 'TERM',
- 'LD_PRELOAD', 'ASAN_OPTIONS', 'UBSAN_OPTIONS']
+ 'LD_PRELOAD', 'ASAN_OPTIONS', 'UBSAN_OPTIONS',
+ 'LSAN_OPTIONS']
for var in pass_vars:
environment[var] = os.environ.get(var, '')