[llvm] r221198 - Handle ASAN_OPTIONS and UBSAN_OPTIONS in TestingConfig.py

[Rafael Espindola]

Author: rafael
Date: Mon Nov  3 17:04:56 2014
New Revision: 221198

URL: http://llvm.org/viewvc/llvm-project?rev=221198&view=rev
Log:
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.

Modified:
    llvm/trunk/test/lit.cfg
    llvm/trunk/utils/lit/lit/TestingConfig.py

Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=221198&r1=221197&r2=221198&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Mon Nov  3 17:04:56 2014
@@ -95,11 +95,6 @@ for symbolizer in ['ASAN_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:

Modified: llvm/trunk/utils/lit/lit/TestingConfig.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestingConfig.py?rev=221198&r1=221197&r2=221198&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/TestingConfig.py (original)
+++ llvm/trunk/utils/lit/lit/TestingConfig.py Mon Nov  3 17:04:56 2014
@@ -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, '')