summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuba Brecka <kuba.brecka@gmail.com>2016-06-06 16:24:47 +0000
committerKuba Brecka <kuba.brecka@gmail.com>2016-06-06 16:24:47 +0000
commit2e26d9faac0826d9ff9b7a5f2b85ce6c34e24e67 (patch)
tree764c01038577fd0c3d1e9eaa676ca190ff97cfb4
parent027c469158d43d2b2b7ba3e758e81017e5ef6da9 (diff)
downloadbcm5719-llvm-2e26d9faac0826d9ff9b7a5f2b85ce6c34e24e67.tar.gz
bcm5719-llvm-2e26d9faac0826d9ff9b7a5f2b85ce6c34e24e67.zip
[asan] Reenable ASan tests in "check-all"
Somehow, in r271049, ASan lit tests and unit tests were removed from “check-all”. Doesn’t seem intentional, let’s fix it. Differential Revision: http://reviews.llvm.org/D21017 llvm-svn: 271905
-rw-r--r--compiler-rt/test/asan/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt
index fffa413e2ca..48796882c74 100644
--- a/compiler-rt/test/asan/CMakeLists.txt
+++ b/compiler-rt/test/asan/CMakeLists.txt
@@ -5,7 +5,7 @@ set(ASAN_DYNAMIC_TESTSUITES)
# TODO(wwchrome): Re-enable Win64 asan tests when ready.
# Disable tests for asan Win64 temporarily.
-if(NOT OS_NAME MATCHES "Windows" OR CMAKE_SIZEOF_VOID_P EQUAL 8)
+if(OS_NAME MATCHES "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set(EXCLUDE_FROM_ALL TRUE)
endif()
@@ -124,6 +124,6 @@ if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME)
endif()
# TODO(wwchrome): Re-enable the tests for asan Win64 when ready.
-if(NOT OS_NAME MATCHES "Windows" OR CMAKE_SIZEOF_VOID_P EQUAL 8)
+if(OS_NAME MATCHES "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set(EXCLUDE_FROM_ALL FALSE)
endif()
OpenPOWER on IntegriCloud