mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 19:50:31 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
18 lines
931 B
C++
18 lines
931 B
C++
--- base/process/memory_unittest.cc.orig 2019-03-11 22:00:51 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)
|