diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-03-15 07:29:58 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-03-15 07:29:58 +0000 |
| commit | e310b1a770981900fd5e6e21d743bbcfbe8248bd (patch) | |
| tree | 7472928252441fb777817d772b2c3157d0b6d939 | |
| parent | 810169e7a1f858a787d2db050deebaee7e10c97f (diff) | |
| download | clang-e310b1a770981900fd5e6e21d743bbcfbe8248bd.tar.gz clang-e310b1a770981900fd5e6e21d743bbcfbe8248bd.tar.bz2 clang-e310b1a770981900fd5e6e21d743bbcfbe8248bd.tar.xz | |
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
| -rw-r--r-- | test/Unit/lit.cfg | 6 | ||||
| -rw-r--r-- | test/lit.cfg | 9 |
2 files changed, 8 insertions, 7 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 diff --git a/test/lit.cfg b/test/lit.cfg index ea835ccb19..f7eb7319b9 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -83,6 +83,10 @@ if clang_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 llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) if not llvm_libs_dir: @@ -142,11 +146,6 @@ if config.test_exec_root is None: lit.load_config(config, site_cfg) raise SystemExit -# 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' - ### # Discover the 'clang' and 'clangcc' to use. |