summaryrefslogtreecommitdiff
path: root/devel/electron5/files/patch-base_process_memory__unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron5/files/patch-base_process_memory__unittest.cc')
-rw-r--r--devel/electron5/files/patch-base_process_memory__unittest.cc18
1 files changed, 0 insertions, 18 deletions
diff --git a/devel/electron5/files/patch-base_process_memory__unittest.cc b/devel/electron5/files/patch-base_process_memory__unittest.cc
deleted file mode 100644
index 9833e91ea0f3..000000000000
--- a/devel/electron5/files/patch-base_process_memory__unittest.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- base/process/memory_unittest.cc.orig 2019-04-08 08:18:04 UTC
-+++ base/process/memory_unittest.cc
-@@ -104,7 +104,7 @@ TEST(MemoryTest, AllocatorShimWorking) {
- // 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) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
-+#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
- !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
-
- namespace {
-@@ -529,5 +529,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
- EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
- EXPECT_TRUE(value_ == nullptr);
- }
--#endif // !defined(OS_OPENBSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) &&
-+#endif // !defined(OS_BSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) &&
- // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)