[llvm-commits] [compiler-rt] r157237 - in /compiler-rt/trunk/lib/asan/tests: asan_interface_test.cc asan_test.cc

[Kostya Serebryany]

Author: kcc
Date: Tue May 22 02:44:30 2012
New Revision: 157237

URL: http://llvm.org/viewvc/llvm-project?rev=157237&view=rev
Log:
[asan] fix one test on 32-bit Mac 10.7; enable another test on Mac

Modified:
    compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc
    compiler-rt/trunk/lib/asan/tests/asan_test.cc

Modified: compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc?rev=157237&r1=157236&r2=157237&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc (original)
+++ compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc Tue May 22 02:44:30 2012
@@ -363,8 +363,6 @@
   __asan_set_error_report_callback(NULL);
 }
 
-#ifdef __linux__
-// http://code.google.com/p/address-sanitizer/issues/detail?id=51
 TEST(AddressSanitizerInterface, GetOwnershipStressTest) {
   std::vector<char *> pointers;
   std::vector<size_t> sizes;
@@ -385,4 +383,3 @@
   for (size_t i = 0, n = pointers.size(); i < n; i++)
     free(pointers[i]);
 }
-#endif  // __linux__

Modified: compiler-rt/trunk/lib/asan/tests/asan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=157237&r1=157236&r2=157237&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_test.cc (original)
+++ compiler-rt/trunk/lib/asan/tests/asan_test.cc Tue May 22 02:44:30 2012
@@ -423,10 +423,11 @@
 TEST(AddressSanitizer, HugeMallocTest) {
 #ifdef __APPLE__
   // It was empirically found out that 1215 megabytes is the maximum amount of
-  // memory available to the process under AddressSanitizer on Darwin.
+  // memory available to the process under AddressSanitizer on 32-bit Mac 10.6.
+  // 32-bit Mac 10.7 gives even less (< 1G).
   // (the libSystem malloc() allows allocating up to 2300 megabytes without
   // ASan).
-  size_t n_megs = __WORDSIZE == 32 ? 1200 : 4100;
+  size_t n_megs = __WORDSIZE == 32 ? 500 : 4100;
 #else
   size_t n_megs = __WORDSIZE == 32 ? 2600 : 4100;
 #endif