[llvm] r177144 - Fixup for r176933: more careful setup of path to llvm-symbolizer
Alexey Samsonov
samsonov at google.com
Fri Mar 15 00:27:49 PDT 2013
Author: samsonov
Date: Fri Mar 15 02:27:49 2013
New Revision: 177144
URL: http://llvm.org/viewvc/llvm-project?rev=177144&view=rev
Log:
Fixup for r176933: more careful setup of path to llvm-symbolizer
Modified:
llvm/trunk/test/Unit/lit.cfg
llvm/trunk/test/lit.cfg
Modified: llvm/trunk/test/Unit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Unit/lit.cfg?rev=177144&r1=177143&r2=177144&view=diff
==============================================================================
--- llvm/trunk/test/Unit/lit.cfg (original)
+++ llvm/trunk/test/Unit/lit.cfg Fri Mar 15 02:27:49 2013
@@ -84,5 +84,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: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=177144&r1=177143&r2=177144&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Fri Mar 15 02:27:49 2013
@@ -63,6 +63,10 @@ if llvm_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
# Propagate 'HOME' through the environment.
if 'HOME' in os.environ:
@@ -90,11 +94,6 @@ config.environment['LLVM_SRC_ROOT'] = ge
config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable',
'')
-# 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'
-
###
import os
More information about the llvm-commits
mailing list