summaryrefslogtreecommitdiff
path: root/test/Unit
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2013-03-15 07:27:49 +0000
committerAlexey Samsonov <samsonov@google.com>2013-03-15 07:27:49 +0000
commit8957f7996c5c0725730202d73c1aae803944773b (patch)
tree119cb697d95703a222fac6e0cb9e7846c9cc2e45 /test/Unit
parentd455d4f4576059606823920150e0fc89a73412e1 (diff)
downloadllvm-8957f7996c5c0725730202d73c1aae803944773b.tar.gz
llvm-8957f7996c5c0725730202d73c1aae803944773b.tar.bz2
llvm-8957f7996c5c0725730202d73c1aae803944773b.tar.xz
Fixup for r176933: more careful setup of path to llvm-symbolizer
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@177144 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 1f6fce8912..8dc7853d91 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -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