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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177145 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 9ba5915d8d8c003b083256c850a54a915d98bbe4..f0e33a0ba4976558acc8fd87a40faa500af0eb12 100644 (file)
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -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

diff --git a/test/lit.cfg b/test/lit.cfg
index ea835ccb198b14ca6e8bfcc17c8cea8b9f04aedd..f7eb7319b9e93668b4e0d12756228231a214fc5b 100644 (file)
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -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.