summaryrefslogtreecommitdiff
path: root/test/Unit
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2013-03-15 07:29:58 +0000
committerAlexey Samsonov <samsonov@google.com>2013-03-15 07:29:58 +0000
commite310b1a770981900fd5e6e21d743bbcfbe8248bd (patch)
tree7472928252441fb777817d772b2c3157d0b6d939 /test/Unit
parent810169e7a1f858a787d2db050deebaee7e10c97f (diff)
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
Diffstat (limited to 'test/Unit')
-rw-r--r--test/Unit/lit.cfg6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 9ba5915d8d..f0e33a0ba4 100644
--- 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