summaryrefslogtreecommitdiffstats
path: root/llvm/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
commitcd27b98d38334cfaa30405a61ffe4785fcd95085 (patch)
tree86b93d1c010d2a1e61a8f563567221cbf4a50f0a /llvm/test/Unit
parent337b0fcf9c3cf78d06b2799748324bc56f3a65b3 (diff)
downloadbcm5719-llvm-cd27b98d38334cfaa30405a61ffe4785fcd95085.tar.gz
bcm5719-llvm-cd27b98d38334cfaa30405a61ffe4785fcd95085.zip
Fixup for r176933: more careful setup of path to llvm-symbolizer
llvm-svn: 177144
Diffstat (limited to 'llvm/test/Unit')
-rw-r--r--llvm/test/Unit/lit.cfg6
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/test/Unit/lit.cfg b/llvm/test/Unit/lit.cfg
index 1f6fce89127..8dc7853d913 100644
--- a/llvm/test/Unit/lit.cfg
+++ b/llvm/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
OpenPOWER on IntegriCloud