diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2014-05-08 14:53:59 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2014-05-08 14:53:59 +0000 |
| commit | fddadefc33491d7ebea30ecfa6bd30ddf81025df (patch) | |
| tree | aa7d2902e399a6f41aa7bb7f99711122402ce709 | |
| parent | 649263626a7481ad214c23e724cd8d2fb263c3cb (diff) | |
| download | bcm5719-llvm-fddadefc33491d7ebea30ecfa6bd30ddf81025df.tar.gz bcm5719-llvm-fddadefc33491d7ebea30ecfa6bd30ddf81025df.zip | |
[ASan tests] Auto-define ASAN_NEEDS_SEGV rather than hardcode it in cmake
llvm-svn: 208322
| -rw-r--r-- | compiler-rt/lib/asan/tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/tests/asan_test_config.h | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt index 27bed9b9688..05ef5d05250 100644 --- a/compiler-rt/lib/asan/tests/CMakeLists.txt +++ b/compiler-rt/lib/asan/tests/CMakeLists.txt @@ -36,7 +36,6 @@ append_if(COMPILER_RT_HAS_WNO_VARIADIC_MACROS_FLAG -Wno-variadic-macros ASAN_UNI list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -DASAN_HAS_BLACKLIST=1 -DASAN_HAS_EXCEPTIONS=1 - -DASAN_NEEDS_SEGV=1 -DASAN_UAR=0) set(ASAN_BLACKLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore") diff --git a/compiler-rt/lib/asan/tests/asan_test_config.h b/compiler-rt/lib/asan/tests/asan_test_config.h index 6eb33ce4431..eee0ab8cb7b 100644 --- a/compiler-rt/lib/asan/tests/asan_test_config.h +++ b/compiler-rt/lib/asan/tests/asan_test_config.h @@ -44,7 +44,11 @@ using std::map; #endif #ifndef ASAN_NEEDS_SEGV -# error "please define ASAN_NEEDS_SEGV" +# if defined(_WIN32) +# define ASAN_NEEDS_SEGV 0 +# else +# define ASAN_NEEDS_SEGV 1 +# endif #endif #ifndef ASAN_AVOID_EXPENSIVE_TESTS |
