diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-03-15 07:27:49 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-03-15 07:27:49 +0000 |
| commit | cd27b98d38334cfaa30405a61ffe4785fcd95085 (patch) | |
| tree | 86b93d1c010d2a1e61a8f563567221cbf4a50f0a | |
| parent | 337b0fcf9c3cf78d06b2799748324bc56f3a65b3 (diff) | |
| download | bcm5719-llvm-cd27b98d38334cfaa30405a61ffe4785fcd95085.tar.gz bcm5719-llvm-cd27b98d38334cfaa30405a61ffe4785fcd95085.zip | |
Fixup for r176933: more careful setup of path to llvm-symbolizer
llvm-svn: 177144
| -rw-r--r-- | llvm/test/Unit/lit.cfg | 6 | ||||
| -rw-r--r-- | llvm/test/lit.cfg | 9 |
2 files changed, 8 insertions, 7 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 diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg index 4953bddf2da..8ee2078b696 100644 --- a/llvm/test/lit.cfg +++ b/llvm/test/lit.cfg @@ -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'] = getattr(config, 'llvm_src_root', '') 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 |
