kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danburk...@apache.org
Subject incubator-kudu git commit: Fix ASAN on OS X
Date Wed, 10 Feb 2016 21:41:53 GMT
Repository: incubator-kudu
Updated Branches:
  refs/heads/master 2d029b34e -> e77f8d1e5


Fix ASAN on OS X

ASAN works on OS X, but LSAN does not (it is Linux only). This commit disables
the ScopedLSANDisabler on non-Linux platforms, and removes the explicit lsan
enable flags when running tests. The flags were only necessary for very old, no
longer supported Clang versions.

Change-Id: I46d6d416415e2fb549522ea8aa422ce78fd396da
Reviewed-on: http://gerrit.cloudera.org:8080/2107
Tested-by: Kudu Jenkins
Reviewed-by: David Ribeiro Alves <david.alves@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/e77f8d1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/e77f8d1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/e77f8d1e

Branch: refs/heads/master
Commit: e77f8d1e529fd9d5067748d1d1f5a91f2d7d7e0a
Parents: 2d029b3
Author: Dan Burkert <dan@cloudera.com>
Authored: Wed Feb 10 11:59:08 2016 -0800
Committer: Dan Burkert <dan@cloudera.com>
Committed: Wed Feb 10 21:41:27 2016 +0000

----------------------------------------------------------------------
 build-support/run-test.sh                | 5 -----
 src/kudu/util/debug/leakcheck_disabler.h | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/e77f8d1e/build-support/run-test.sh
----------------------------------------------------------------------
diff --git a/build-support/run-test.sh b/build-support/run-test.sh
index f9f7f60..486a4a3 100755
--- a/build-support/run-test.sh
+++ b/build-support/run-test.sh
@@ -114,11 +114,6 @@ TSAN_OPTIONS="$TSAN_OPTIONS history_size=7"
 TSAN_OPTIONS="$TSAN_OPTIONS external_symbolizer_path=$ASAN_SYMBOLIZER_PATH"
 export TSAN_OPTIONS
 
-# Enable leak detection even under LLVM 3.4, where it was disabled by default.
-# This flag only takes effect when running an ASAN build.
-ASAN_OPTIONS="$ASAN_OPTIONS detect_leaks=1"
-export ASAN_OPTIONS
-
 # Set up suppressions for LeakSanitizer
 LSAN_OPTIONS="$LSAN_OPTIONS suppressions=$SOURCE_ROOT/build-support/lsan-suppressions.txt"
 export LSAN_OPTIONS

http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/e77f8d1e/src/kudu/util/debug/leakcheck_disabler.h
----------------------------------------------------------------------
diff --git a/src/kudu/util/debug/leakcheck_disabler.h b/src/kudu/util/debug/leakcheck_disabler.h
index 493abe4..bab724f 100644
--- a/src/kudu/util/debug/leakcheck_disabler.h
+++ b/src/kudu/util/debug/leakcheck_disabler.h
@@ -34,7 +34,9 @@ class ScopedLeakCheckDisabler {
 
 #if defined(__has_feature)
 #  if __has_feature(address_sanitizer)
+#    if defined(__linux__)
   ScopedLSANDisabler lsan_disabler;
+#    endif
 #  endif
 #endif
 


Mime
View raw message