Revert r222091 because it caused a buildbot failure.

llvm-svn: 222095
This commit is contained in:
Jay Foad 2014-11-16 09:44:37 +00:00
parent 949d50bc71
commit 670bdb5a64
3 changed files with 4 additions and 5 deletions

View File

@ -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) {

View File

@ -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

View File

@ -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)