r177145 - Fixup for r176934. More careful setup of path to llvm-symbolizer

[Alexey Samsonov]

Author: samsonov
Date: Fri Mar 15 02:29:58 2013
New Revision: 177145

URL: http://llvm.org/viewvc/llvm-project?rev=177145&view=rev
Log:
Fixup for r176934. More careful setup of path to llvm-symbolizer

Modified:
    cfe/trunk/test/Unit/lit.cfg
    cfe/trunk/test/lit.cfg

Modified: cfe/trunk/test/Unit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Unit/lit.cfg?rev=177145&r1=177144&r2=177145&view=diff
==============================================================================
--- cfe/trunk/test/Unit/lit.cfg (original)
+++ cfe/trunk/test/Unit/lit.cfg Fri Mar 15 02:29:58 2013
@@ -87,5 +87,7 @@ if config.enable_shared:
 
 # 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'
+if llvm_tools_dir:
+    llvm_symbolizer_path = os.path.join(llvm_tools_dir, 'llvm-symbolizer')
+    config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
+    config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path

Modified: cfe/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=177145&r1=177144&r2=177145&view=diff
==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Fri Mar 15 02:29:58 2013
@@ -83,6 +83,10 @@ if clang_obj_root is not None:
         lit.fatal('No LLVM tools dir set!')
     path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
     config.environment['PATH'] = path
+    # Setup paths to llvm-symbolizer for Sanitizer tools.
+    llvm_symbolizer_path = os.path.join(llvm_tools_dir, 'llvm-symbolizer')
+    config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
+    config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
 
     llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
     if not llvm_libs_dir:
@@ -142,11 +146,6 @@ if config.test_exec_root is None:
     lit.load_config(config, site_cfg)
     raise SystemExit
 
-# 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'
-
 ###
 
 # Discover the 'clang' and 'clangcc' to use.