summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Ostapenko <chefmax7@gmail.com>2017-04-13 12:00:56 +0000
committerMaxim Ostapenko <chefmax7@gmail.com>2017-04-13 12:00:56 +0000
commit661033d57588c454da66a8ebd434f0926ca16f21 (patch)
treef2b52bdfd049f8faabd36163d4a8ccb5ee1b9a38
parent9763a3249f89c8e2e2cbd0ec23e5cca90ef8d436 (diff)
downloadbcm5719-llvm-661033d57588c454da66a8ebd434f0926ca16f21.tar.gz
bcm5719-llvm-661033d57588c454da66a8ebd434f0926ca16f21.zip
[lsan] Reenable lsan tests on ARM bots
This patch addresses pr32636. Enable lsan tests on ARM bots filtering out Thumb targets. Tested locally on ARM Arndale board in two configurations: 1) CFLAGS="-march=armv7-a" Testing Time: 37.57s Expected Passes : 69 Unsupported Tests : 7 2) CFLAGS="-march=armv7-a -mthumb" Testing Time: 0.16s Unsupported Tests : 76 Differential Revision: https://reviews.llvm.org/D32007 llvm-svn: 300194
-rw-r--r--compiler-rt/test/asan/lit.cfg2
-rw-r--r--compiler-rt/test/lsan/lit.common.cfg5
2 files changed, 3 insertions, 4 deletions
diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg
index 9093b44c1bf..7d684a1ae7a 100644
--- a/compiler-rt/test/asan/lit.cfg
+++ b/compiler-rt/test/asan/lit.cfg
@@ -213,7 +213,7 @@ if config.target_arch != 'arm' and config.target_arch != 'armhf' and config.targ
config.available_features.add('stable-runtime')
# Fast unwinder doesn't work with Thumb
-if not re.match('-mthumb', config.target_cflags):
+if re.search('mthumb', config.target_cflags) is not None:
config.available_features.add('fast-unwinder-works')
# Turn on leak detection on 64-bit Linux.
diff --git a/compiler-rt/test/lsan/lit.common.cfg b/compiler-rt/test/lsan/lit.common.cfg
index 202620cdd05..b90c7ef4860 100644
--- a/compiler-rt/test/lsan/lit.common.cfg
+++ b/compiler-rt/test/lsan/lit.common.cfg
@@ -53,12 +53,11 @@ config.substitutions.append( ("%clang_lsan ", build_invocation(clang_lsan_cflags
config.substitutions.append( ("%clangxx_lsan ", build_invocation(clang_lsan_cxxflags)) )
# LeakSanitizer tests are currently supported on x86-64 Linux, arm Linux and mips64 Linux only.
-# LSAN breaks on Thumb, so disabling from all ARM targets until we sort this out. PR32636.
-if config.host_os not in ['Linux'] or config.host_arch not in ['x86_64', 'mips64']:
+if config.host_os not in ['Linux'] or config.host_arch not in ['x86_64', 'mips64', 'arm', 'armhf', 'armv7l']:
config.unsupported = True
# Don't support Thumb due to broken fast unwinder
-if re.match('-mthumb', config.target_cflags):
+if re.search('mthumb', config.target_cflags) is not None:
config.unsupported = True
config.suffixes = ['.c', '.cc', '.cpp']
OpenPOWER on IntegriCloud