From cf36b5fd3277bb68314857fe4308210cf9101865 Mon Sep 17 00:00:00 2001 From: Filipe Cabecinhas Date: Thu, 10 Mar 2016 18:46:23 +0000 Subject: [PATCH] [sanitizer_common tests] Make Darwin a Posix system and bring the stable-runtime definition from ASan tests. Summary: This is an initial setup in order to move some additional tests from Linux onto Posix. I also moved decorate_proc_maps onto the Linux directory Finally added msan's definition for "stable-runtime". Only a test requires it, and its commit message (r248014) seems to imply that AArch64 is problematic with MSan. Reviewers: samsonov, rengolin, t.p.northover, eugenis Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D17928 llvm-svn: 263142 --- compiler-rt/test/msan/lit.cfg | 3 +++ .../TestCases/{Posix => Linux}/decorate_proc_maps.cc | 0 .../test/sanitizer_common/TestCases/Posix/lit.local.cfg | 2 +- compiler-rt/test/sanitizer_common/lit.common.cfg | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) rename compiler-rt/test/sanitizer_common/TestCases/{Posix => Linux}/decorate_proc_maps.cc (100%) diff --git a/compiler-rt/test/msan/lit.cfg b/compiler-rt/test/msan/lit.cfg index ed797bdf5cc3..d23ff31bc748 100644 --- a/compiler-rt/test/msan/lit.cfg +++ b/compiler-rt/test/msan/lit.cfg @@ -32,3 +32,6 @@ config.suffixes = ['.c', '.cc', '.cpp'] # MemorySanitizer tests are currently supported on Linux only. if config.host_os not in ['Linux']: config.unsupported = True + +if config.target_arch != 'aarch64': + config.available_features.add('stable-runtime') diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc similarity index 100% rename from compiler-rt/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc rename to compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg b/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg index a6d96d3054cf..60a9460820a6 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg +++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg @@ -5,5 +5,5 @@ def getRoot(config): root = getRoot(config) -if root.host_os in ['Windows', 'Darwin']: +if root.host_os in ['Windows']: config.unsupported = True diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg b/compiler-rt/test/sanitizer_common/lit.common.cfg index a9309036ed3e..b32fb1ba9685 100644 --- a/compiler-rt/test/sanitizer_common/lit.common.cfg +++ b/compiler-rt/test/sanitizer_common/lit.common.cfg @@ -23,6 +23,9 @@ else: config.available_features.add(config.tool_name) +if config.target_arch not in ['arm', 'armhf', 'aarch64']: + config.available_features.add('stable-runtime') + if config.host_os == 'Darwin': # On Darwin, we default to `abort_on_error=1`, which would make tests run # much slower. Let's override this and run lit tests with 'abort_on_error=0'.