From 2136197d687ac8d074e28ef6769c11e38c52b6b9 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Mon, 27 Feb 2017 11:00:20 +0300 Subject: Set detect_leaks = false and halt_on_error = false by default. Set detect_leaks and halt_on_error to false by default because mic installs asan-build-env package too late. --- libsanitizer/asan/asan_flags.cc | 2 +- libsanitizer/asan/asan_flags.inc | 2 +- libsanitizer/lsan/lsan.cc | 2 +- libsanitizer/sanitizer_common/sanitizer_flags.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libsanitizer/asan/asan_flags.cc b/libsanitizer/asan/asan_flags.cc index 91d09175c3c..db257c40bc9 100644 --- a/libsanitizer/asan/asan_flags.cc +++ b/libsanitizer/asan/asan_flags.cc @@ -59,7 +59,7 @@ void InitializeFlags() { { CommonFlags cf; cf.CopyFrom(*common_flags()); - cf.detect_leaks = CAN_SANITIZE_LEAKS; + cf.detect_leaks = false; cf.external_symbolizer_path = GetEnv("ASAN_SYMBOLIZER_PATH"); cf.malloc_context_size = kDefaultMallocContextSize; cf.intercept_tls_get_addr = true; diff --git a/libsanitizer/asan/asan_flags.inc b/libsanitizer/asan/asan_flags.inc index 563b464bff1..c94e22f807b 100644 --- a/libsanitizer/asan/asan_flags.inc +++ b/libsanitizer/asan/asan_flags.inc @@ -133,6 +133,6 @@ ASAN_FLAG(int, detect_odr_violation, 2, ASAN_FLAG(bool, dump_instruction_bytes, false, "If true, dump 16 bytes starting at the instruction that caused SEGV") ASAN_FLAG(const char *, suppressions, "", "Suppressions file name.") -ASAN_FLAG(bool, halt_on_error, true, +ASAN_FLAG(bool, halt_on_error, false, "Crash the program after printing the first error report " "(WARNING: USE AT YOUR OWN RISK!)") diff --git a/libsanitizer/lsan/lsan.cc b/libsanitizer/lsan/lsan.cc index 49b443217c9..d544dfa5f2c 100644 --- a/libsanitizer/lsan/lsan.cc +++ b/libsanitizer/lsan/lsan.cc @@ -55,7 +55,7 @@ static void InitializeFlags() { cf.CopyFrom(*common_flags()); cf.external_symbolizer_path = GetEnv("LSAN_SYMBOLIZER_PATH"); cf.malloc_context_size = 30; - cf.detect_leaks = true; + cf.detect_leaks = false; cf.exitcode = 0; OverrideCommonFlags(cf); } diff --git a/libsanitizer/sanitizer_common/sanitizer_flags.inc b/libsanitizer/sanitizer_common/sanitizer_flags.inc index 75f98ace87d..7d951963ce6 100644 --- a/libsanitizer/sanitizer_common/sanitizer_flags.inc +++ b/libsanitizer/sanitizer_common/sanitizer_flags.inc @@ -60,7 +60,7 @@ COMMON_FLAG( COMMON_FLAG( int, verbosity, 0, "Verbosity level (0 - silent, 1 - a bit of output, 2+ - more output).") -COMMON_FLAG(bool, detect_leaks, true, "Enable memory leak detection.") +COMMON_FLAG(bool, detect_leaks, false, "Enable memory leak detection.") COMMON_FLAG( bool, leak_check_at_exit, true, "Invoke leak checking in an atexit handler. Has no effect if " -- cgit v1.2.3