From 8e289f4cc70a8e806bbb36b44ae2b0e9398c0616 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Mon, 25 May 2020 22:57:56 +0200 Subject: Detect use of clang version of address sanitizer. --- searchlib/src/tests/query/streaming_query_large_test.cpp | 8 ++++++++ vespalib/src/tests/exception_classes/silenceuncaught_test.cpp | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/searchlib/src/tests/query/streaming_query_large_test.cpp b/searchlib/src/tests/query/streaming_query_large_test.cpp index a76ec54098e..28401e9d685 100644 --- a/searchlib/src/tests/query/streaming_query_large_test.cpp +++ b/searchlib/src/tests/query/streaming_query_large_test.cpp @@ -10,6 +10,14 @@ using namespace search; using namespace search::query; using namespace search::streaming; +#ifndef __SANITIZE_ADDRESS__ +#if defined(__has_feature) +#if __has_feature(address_sanitizer) +#define __SANITIZE_ADDRESS__ +#endif +#endif +#endif + namespace { void setMaxStackSize(rlim_t maxStackSize) diff --git a/vespalib/src/tests/exception_classes/silenceuncaught_test.cpp b/vespalib/src/tests/exception_classes/silenceuncaught_test.cpp index a57dd917ce0..8d81d9e0821 100644 --- a/vespalib/src/tests/exception_classes/silenceuncaught_test.cpp +++ b/vespalib/src/tests/exception_classes/silenceuncaught_test.cpp @@ -5,6 +5,14 @@ using namespace vespalib; +#ifndef __SANITIZE_ADDRESS__ +#if defined(__has_feature) +#if __has_feature(address_sanitizer) +#define __SANITIZE_ADDRESS__ +#endif +#endif +#endif + TEST("that uncaught exception causes negative exitcode.") { SlaveProc proc("ulimit -c 0 && exec ./vespalib_caught_uncaught_app uncaught"); proc.wait(); -- cgit v1.2.3