From 3ada4ec04ca7f8f2938b73e85b594a6e1ae7c15a Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 3 Nov 2014 23:04:56 +0000 Subject: [PATCH] Handle ASAN_OPTIONS and UBSAN_OPTIONS in TestingConfig.py Currently they are passed to tests of llvm itself, but not, for example, lld. With this patch the options are visible in every test. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221198 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/lit.cfg | 5 ----- utils/lit/lit/TestingConfig.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/test/lit.cfg b/test/lit.cfg index c5179f7a582..40b5a25c497 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -95,11 +95,6 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']: if symbolizer in os.environ: config.environment[symbolizer] = os.environ[symbolizer] -# Propagate options for sanitizers. -for options in ['ASAN_OPTIONS', 'UBSAN_OPTIONS']: - if options in os.environ: - config.environment[options] = os.environ[options] - # Set up OCAMLPATH to include newly built OCaml libraries. llvm_lib_dir = getattr(config, 'llvm_lib_dir', None) if not llvm_lib_dir: diff --git a/utils/lit/lit/TestingConfig.py b/utils/lit/lit/TestingConfig.py index b44b366c552..4cd9486aaaa 100644 --- a/utils/lit/lit/TestingConfig.py +++ b/utils/lit/lit/TestingConfig.py @@ -23,7 +23,7 @@ class TestingConfig: } pass_vars = ['LIBRARY_PATH', 'LD_LIBRARY_PATH', 'SYSTEMROOT', 'TERM', - 'LD_PRELOAD'] + 'LD_PRELOAD', 'ASAN_OPTIONS', 'UBSAN_OPTIONS'] for var in pass_vars: environment[var] = os.environ.get(var, '') -- 2.34.1