[compiler-rt] r300194 - [lsan] Reenable lsan tests on ARM bots

[Maxim Ostapenko via llvm-commits]

Author: chefmax
Date: Thu Apr 13 07:00:56 2017
New Revision: 300194

URL: http://llvm.org/viewvc/llvm-project?rev=300194&view=rev
Log:
[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

Modified:
    compiler-rt/trunk/test/asan/lit.cfg
    compiler-rt/trunk/test/lsan/lit.common.cfg

Modified: compiler-rt/trunk/test/asan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.cfg?rev=300194&r1=300193&r2=300194&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/lit.cfg (original)
+++ compiler-rt/trunk/test/asan/lit.cfg Thu Apr 13 07:00:56 2017
@@ -213,7 +213,7 @@ if config.target_arch != 'arm' and confi
   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.

Modified: compiler-rt/trunk/test/lsan/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lsan/lit.common.cfg?rev=300194&r1=300193&r2=300194&view=diff
==============================================================================
--- compiler-rt/trunk/test/lsan/lit.common.cfg (original)
+++ compiler-rt/trunk/test/lsan/lit.common.cfg Thu Apr 13 07:00:56 2017
@@ -53,12 +53,11 @@ config.substitutions.append( ("%clang_ls
 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']