summaryrefslogtreecommitdiff
path: root/test/lsan
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
commitb84477f989c2bc595ba252f22bc346bdc8de597c (patch)
tree12c74681dfb0013bd6af0ea2b4ca8c9e2e6babfb /test/lsan
parenta1687c29181cb02ce005689e09613af28de45de0 (diff)
[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 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@300194 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lsan')
-rw-r--r--test/lsan/lit.common.cfg5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/lsan/lit.common.cfg b/test/lsan/lit.common.cfg
index 202620cdd..b90c7ef48 100644
--- a/test/lsan/lit.common.cfg
+++ b/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']