X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FUnit%2Flit.cfg;h=15cf626c72bf9f3a8de6311c9a62b9fde38325f6;hb=fc699872e35ec794d7373680be6f1946fe8e9ca6;hp=1f6fce89127549b2862f5e2032edcf38a2ba1407;hpb=992dbcfbcc9b666f61d88fc6ae5010f57db07369;p=oota-llvm.git

diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 1f6fce89127..15cf626c72b 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -28,6 +28,11 @@ if 'TMP' in os.environ:
 if 'TEMP' in os.environ:
     config.environment['TEMP'] = os.environ['TEMP']
 
+# Propagate path to symbolizer for ASan/MSan.
+for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']:
+    if symbolizer in os.environ:
+        config.environment[symbolizer] = os.environ[symbolizer]
+
 ###
 
 # Check that the object root is known.
@@ -81,8 +86,3 @@ if config.enable_shared:
         shlibpath = os.pathsep + shlibpath
     shlibpath = config.shlibdir + shlibpath
     config.environment[config.shlibpath_var] = shlibpath
-
-# Setup paths to llvm-symbolizer for Sanitizer tools.
-llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
-config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'