[compiler-rt] r222095 - Revert r222091 because it caused a buildbot failure.

[Jay Foad]

Author: foad
Date: Sun Nov 16 03:44:37 2014
New Revision: 222095

URL: http://llvm.org/viewvc/llvm-project?rev=222095&view=rev
Log:
Revert r222091 because it caused a buildbot failure.

Modified:
    compiler-rt/trunk/test/asan/TestCases/Linux/coverage-and-lsan.cc
    compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc
    compiler-rt/trunk/test/asan/lit.cfg

Modified: compiler-rt/trunk/test/asan/TestCases/Linux/coverage-and-lsan.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/coverage-and-lsan.cc?rev=222095&r1=222094&r2=222095&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/coverage-and-lsan.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Linux/coverage-and-lsan.cc Sun Nov 16 03:44:37 2014
@@ -8,7 +8,7 @@
 // RUN: ASAN_OPTIONS=coverage=1:coverage_dir=%T/coverage-and-lsan:verbosity=1 not %run %t 2>&1 | FileCheck %s
 // RUN: %sancov print %T/coverage-and-lsan/*.sancov 2>&1
 //
-// REQUIRES: leak-detection
+// REQUIRES: asan-64-bits
 
 int *g = new int;
 int main(int argc, char **argv) {

Modified: compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc?rev=222095&r1=222094&r2=222095&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Linux/leak.cc Sun Nov 16 03:44:37 2014
@@ -1,5 +1,5 @@
 // Minimal test for LeakSanitizer+AddressSanitizer.
-// REQUIRES: leak-detection
+// REQUIRES: asan-64-bits
 //
 // RUN: %clangxx_asan  %s -o %t
 // RUN: ASAN_OPTIONS=detect_leaks=1 not %run %t  2>&1 | FileCheck %s

Modified: compiler-rt/trunk/test/asan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.cfg?rev=222095&r1=222094&r2=222095&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/lit.cfg (original)
+++ compiler-rt/trunk/test/asan/lit.cfg Sun Nov 16 03:44:37 2014
@@ -122,10 +122,9 @@ config.available_features.add("asan-" +
 if config.target_arch != 'arm':
   config.available_features.add('stable-runtime')
 
-# Turn on leak detection on x86_64 Linux.
-if config.host_os == 'Linux' and config.host_arch == 'x86_64':
+# Turn on leak detection on 64-bit Linux.
+if config.host_os == 'Linux' and config.bits == '64':
   config.environment['ASAN_OPTIONS'] = 'detect_leaks=1'
-  config.available_features.add('leak-detection')
 
 # Set LD_LIBRARY_PATH to pick dynamic runtime up properly.
 push_ld_library_path(config, config.compiler_rt_libdir)