From 670bdb5a64291362d585bb4e744a48094f7d4695 Mon Sep 17 00:00:00 2001 From: Jay Foad Date: Sun, 16 Nov 2014 09:44:37 +0000 Subject: [PATCH] Revert r222091 because it caused a buildbot failure. llvm-svn: 222095 --- compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc | 2 +- compiler-rt/test/asan/TestCases/Linux/leak.cc | 2 +- compiler-rt/test/asan/lit.cfg | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc b/compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc index 4cb8e2a..f0d371f 100644 --- a/compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc +++ b/compiler-rt/test/asan/TestCases/Linux/coverage-and-lsan.cc @@ -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) { diff --git a/compiler-rt/test/asan/TestCases/Linux/leak.cc b/compiler-rt/test/asan/TestCases/Linux/leak.cc index 36dc6dd..df7850f 100644 --- a/compiler-rt/test/asan/TestCases/Linux/leak.cc +++ b/compiler-rt/test/asan/TestCases/Linux/leak.cc @@ -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 diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg index 5208ebf..2acc542 100644 --- a/compiler-rt/test/asan/lit.cfg +++ b/compiler-rt/test/asan/lit.cfg @@ -122,10 +122,9 @@ config.available_features.add("asan-" + config.bits + "-bits") 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) -- 2.7.4