[compiler-rt] r208545 - [asan] one more attempt to enable lsan by default (PR19521)

[Kostya Serebryany]

Author: kcc
Date: Mon May 12 07:49:48 2014
New Revision: 208545

URL: http://llvm.org/viewvc/llvm-project?rev=208545&view=rev
Log:
[asan] one more attempt to enable lsan by default (PR19521)

Modified:
    compiler-rt/trunk/lib/asan/asan_rtl.cc
    compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=208545&r1=208544&r2=208545&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Mon May 12 07:49:48 2014
@@ -236,7 +236,7 @@ static void ParseFlagsFromString(Flags *
 void InitializeFlags(Flags *f, const char *env) {
   CommonFlags *cf = common_flags();
   SetCommonFlagsDefaults(cf);
-  cf->detect_leaks = false;  // CAN_SANITIZE_LEAKS;
+  cf->detect_leaks = CAN_SANITIZE_LEAKS;
   cf->external_symbolizer_path = GetEnv("ASAN_SYMBOLIZER_PATH");
   cf->malloc_context_size = kDefaultMallocContextSize;
   cf->intercept_tls_get_addr = true;

Modified: compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc?rev=208545&r1=208544&r2=208545&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc Mon May 12 07:49:48 2014
@@ -3,7 +3,7 @@
 //
 // RUN: %clangxx_asan  %s -o %t
 // RUN: ASAN_OPTIONS=detect_leaks=1 not %run %t  2>&1 | FileCheck %s
-// RUN: ASAN_OPTIONS=""                 %run %t
+// RUN: ASAN_OPTIONS=""             not %run %t  2>&1 | FileCheck %s
 // RUN: ASAN_OPTIONS=detect_leaks=0     %run %t
 #include <stdio.h>
 int *t;