[ASan] Fix leak tests on 64-bit targets other than x86-64

[foad]

Summary

This test explicitly sets ASAN_OPTIONS=detect_leaks=1 which is only
supported on x86-64. The test is currently restricted to run only on
64-bit targets, but needs to be restricted further so it only runs on
x86-64.

[earthdok]

test/asan/lit.cfg

125–126

Where does this mention x86_64? Looks like all this patch does is restrict the test to 64-bit Linux, which is already the case.

[foad]

test/asan/lit.cfg

125–126

Good point. I assumed that the existing test for enabling detect_leaks=1 was correct, but it wasn't:

# Turn on leak detection on 64-bit Linux.
if config.host_os == 'Linux' and config.bits == '64':
  config.environment['ASAN_OPTIONS'] = 'detect_leaks=1'

test/asan/Unit/lit.site.cfg.in has a better test:

# Enable leak detection in ASan unit tests on x86_64-linux.
if config.host_os == 'Linux' and config.host_arch == 'x86_64':
  config.environment['ASAN_OPTIONS'] = 'detect_leaks=1'

[earthdok]

test/asan/lit.cfg

125–126

You're right. This code needs to be deduplicated. Alexey wrote those configs so he's in a better position to help.

[foad]

Fix test for leak detection support.
Include another test case that requires leak detection.

[earthdok]

test/asan/lit.cfg

126

Sorry, I thought Alexey had taken over this review.

Is there any way we could get rid of the code duplication between test/asan/lit.cfg and test/asan/Unit/lit.site.cfg.in?

[samsonov]

LGTM. Let's proceed with this small change for now.

[foad]

test/asan/lit.cfg

126

I agree it would be nice to get rid of the duplication, but I don't feel confident enough with lit configuration to do it myself. Maybe it belongs in test/lit.common.cfg?

[earthdok]

test/asan/lit.cfg

126

That makes sense to me. Alexey?

[samsonov]

test/asan/lit.cfg

126

Hm? Doesn't "leak-detection" feature make sense only for ASan tests? Unfortunately, configs for lit-tests and unit tests are different. I'd submit the change as-is.

[earthdok]

test/asan/lit.cfg

126

MSan as well, eventually. Any tool that does not support it will simply not have any tests that depend on this feature.

[samsonov]

test/asan/lit.cfg

126

Alright, let's define "leak-detection" feature in test/lit.common.cfg and then setup ASAN_OPTIONS here if this feature is enabled.

[foad]

I committed this but had to revert it, because it broke the asan testsuite's 32bitConfig on x86_64. I've had another go in D6396.

test/asan/TestCases/Linux/coverage-and-lsan.cc

 // Make sure coverage is dumped even if there are reported leaks.
 //
 // RUN: %clangxx_asan -mllvm -asan-coverage=1 %s -o %t
 //
 // RUN: rm -rf %T/coverage-and-lsan
 //
 // RUN: mkdir -p %T/coverage-and-lsan/normal
 // 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: asan-64-bits
+// REQUIRES: leak-detection
 
 int *g = new int;
 int main(int argc, char **argv) {
   g = 0;
   return 0;
 }
 
 // CHECK: LeakSanitizer: detected memory leaks
 // CHECK: CovDump:

test/asan/TestCases/Linux/leak.cc

 // Minimal test for LeakSanitizer+AddressSanitizer.
-// REQUIRES: asan-64-bits
+// REQUIRES: leak-detection
 //
 // RUN: %clangxx_asan  %s -o %t
 // RUN: ASAN_OPTIONS=detect_leaks=1 not %run %t  2>&1 | FileCheck %s
 // RUN: ASAN_OPTIONS=""             not %run %t  2>&1 | FileCheck %s
 // RUN: ASAN_OPTIONS=detect_leaks=0     %run %t
 #include <stdio.h>
 int *t;
 
 int main(int argc, char **argv) {
   t = new int[argc - 1];
   printf("t: %p\n", t);
   t = 0;
 }
 // CHECK: LeakSanitizer: detected memory leaks

test/asan/lit.cfg

 
 config.available_features.add("asan-" + config.bits + "-bits")
 
 # Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
 # because the test hangs.
 if config.target_arch != 'arm':
   config.available_features.add('stable-runtime')
 
-# Turn on leak detection on 64-bit Linux.
-if config.host_os == 'Linux' and config.bits == '64':
+# Turn on leak detection on x86_64 Linux.
+if config.host_os == 'Linux' and config.host_arch == 'x86_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)
 
 # GCC-ASan uses dynamic runtime by default.
 if config.compiler_id == 'GNU':
   gcc_dir = os.path.dirname(config.clang)
   libasan_dir = os.path.join(gcc_dir, "..", "lib" + config.bits)