diff options
Diffstat (limited to 'www/chromium/files/patch-base_process_memory__unittest.cc')
| -rw-r--r-- | www/chromium/files/patch-base_process_memory__unittest.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index c401f8285624..56989b877dcf 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,19 +1,15 @@ ---- base/process/memory_unittest.cc.orig 2017-06-05 19:03:00 UTC -+++ base/process/memory_unittest.cc -@@ -101,10 +101,10 @@ TEST(MemoryTest, AllocatorShimWorking) { - #endif - } - --// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan -+// BSD does not support these tests. Don't test these on ASan/TSan/MSan +--- base/process/memory_unittest.cc.orig 2017-09-05 21:05:11.000000000 +0200 ++++ base/process/memory_unittest.cc 2017-09-06 16:53:33.919374000 +0200 +@@ -104,7 +104,7 @@ + // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan // configurations: only test the real allocator. // Windows only supports these tests with the allocator shim in place. --#if !defined(OS_OPENBSD) && \ -+#if !defined(OS_BSD) && \ - BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \ +-#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ ++#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -@@ -508,5 +508,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { + namespace { +@@ -507,5 +507,5 @@ EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == NULL); } |