[compiler-rt] r185148 - [ASan] Migrate lit tests to external symbolizer from asan_symbolize.py script

[Alexey Samsonov]

Author: samsonov
Date: Fri Jun 28 07:50:12 2013
New Revision: 185148

URL: http://llvm.org/viewvc/llvm-project?rev=185148&view=rev
Log:
[ASan] Migrate lit tests to external symbolizer from asan_symbolize.py script

Modified:
    compiler-rt/trunk/lib/asan/lit_tests/lit.cfg
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc

Modified: compiler-rt/trunk/lib/asan/lit_tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/lit.cfg?rev=185148&r1=185147&r2=185148&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/lit.cfg (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/lit.cfg Fri Jun 28 07:50:12 2013
@@ -69,21 +69,12 @@ config.substitutions.append( ("%clangxx_
 # Setup path to external LLVM symbolizer to run AddressSanitizer output tests.
 llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
 if llvm_tools_dir:
-  config.environment['LLVM_SYMBOLIZER_PATH'] = os.path.join(
-      llvm_tools_dir, "llvm-symbolizer")
+  config.environment['ASAN_SYMBOLIZER_PATH'] = os.path.join(
+       llvm_tools_dir, "llvm-symbolizer")
 
-# Setup path to symbolizer script.
-# FIXME: Instead we should copy this script to the build tree and point
-#        at it there.
-asan_source_dir = get_required_attr(config, "asan_source_dir")
-symbolizer = os.path.join(asan_source_dir,
-                         'scripts', 'asan_symbolize.py')
-if not os.path.exists(symbolizer):
-  lit.fatal("Can't find symbolizer script on path %r" % symbolizer)
 # Define %symbolize substitution that filters output through
-# symbolizer and c++filt (for demangling).
-config.substitutions.append( ("%symbolize ", (" " + symbolizer +
-                                              " | c++filt " )))
+# c++filt (for demangling, somewhy it doesn't work for symbolizer on Mac).
+config.substitutions.append( ("%symbolize ", " c++filt "))
 
 # Define CHECK-%os to check for OS-dependent output.
 config.substitutions.append( ('CHECK-%os', ("CHECK-" + config.host_os)))

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc?rev=185148&r1=185147&r2=185148&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc Fri Jun 28 07:50:12 2013
@@ -35,8 +35,8 @@ void SymbolizerPrepareForSandboxing() {
   // Do nothing on Windows.
 }
 
-const char *Demangle(const char *MangledName) {
-  return MangledName;
+const char *DemangleCXXABI(const char *name) {
+  return name;
 }
 
 }  // namespace __sanitizer