Index: core/src/fxcrt/fx_basic_memmgr_unittest.cpp |
diff --git a/core/src/fxcrt/fx_basic_memmgr_unittest.cpp b/core/src/fxcrt/fx_basic_memmgr_unittest.cpp |
index 94e26c88b23a2f07e67c11b57e92c74575291fd8..819cbb4d085fbb92ee870ec756570c5900813ffc 100644 |
--- a/core/src/fxcrt/fx_basic_memmgr_unittest.cpp |
+++ b/core/src/fxcrt/fx_basic_memmgr_unittest.cpp |
@@ -20,52 +20,51 @@ const size_t kOverflowIntAlloc2D = kMaxIntAlloc / kWidth + 10; |
// TODO(tsepez): re-enable OOM tests if we can find a way to |
// prevent it from hosing the bots. |
TEST(fxcrt, DISABLED_FX_AllocOOM) { |
- EXPECT_DEATH_IF_SUPPORTED((void) FX_Alloc(int, kMaxIntAlloc), ""); |
+ EXPECT_DEATH_IF_SUPPORTED((void)FX_Alloc(int, kMaxIntAlloc), ""); |
- int* ptr = FX_Alloc(int, 1); |
- EXPECT_TRUE(ptr); |
- EXPECT_DEATH_IF_SUPPORTED((void) FX_Realloc(int, ptr, kMaxIntAlloc), ""); |
- FX_Free(ptr); |
+ int* ptr = FX_Alloc(int, 1); |
+ EXPECT_TRUE(ptr); |
+ EXPECT_DEATH_IF_SUPPORTED((void)FX_Realloc(int, ptr, kMaxIntAlloc), ""); |
+ FX_Free(ptr); |
} |
TEST(fxcrt, FX_AllocOverflow) { |
- EXPECT_DEATH_IF_SUPPORTED((void) FX_Alloc(int, kOverflowIntAlloc), ""); |
+ EXPECT_DEATH_IF_SUPPORTED((void)FX_Alloc(int, kOverflowIntAlloc), ""); |
- int* ptr = FX_Alloc(int, 1); |
- EXPECT_TRUE(ptr); |
- EXPECT_DEATH_IF_SUPPORTED( |
- (void) FX_Realloc(int, ptr, kOverflowIntAlloc), ""); |
- FX_Free(ptr); |
+ int* ptr = FX_Alloc(int, 1); |
+ EXPECT_TRUE(ptr); |
+ EXPECT_DEATH_IF_SUPPORTED((void)FX_Realloc(int, ptr, kOverflowIntAlloc), ""); |
+ FX_Free(ptr); |
} |
TEST(fxcrt, FX_AllocOverflow2D) { |
- EXPECT_DEATH_IF_SUPPORTED( |
- (void) FX_Alloc2D(int, kWidth, kOverflowIntAlloc2D), ""); |
+ EXPECT_DEATH_IF_SUPPORTED((void)FX_Alloc2D(int, kWidth, kOverflowIntAlloc2D), |
+ ""); |
} |
TEST(fxcrt, DISABLED_FX_TryAllocOOM) { |
- EXPECT_FALSE(FX_TryAlloc(int, kMaxIntAlloc)); |
+ EXPECT_FALSE(FX_TryAlloc(int, kMaxIntAlloc)); |
- int* ptr = FX_Alloc(int, 1); |
- EXPECT_TRUE(ptr); |
- EXPECT_FALSE(FX_TryRealloc(int, ptr, kMaxIntAlloc)); |
- FX_Free(ptr); |
+ int* ptr = FX_Alloc(int, 1); |
+ EXPECT_TRUE(ptr); |
+ EXPECT_FALSE(FX_TryRealloc(int, ptr, kMaxIntAlloc)); |
+ FX_Free(ptr); |
} |
TEST(fxcrt, FX_TryAllocOverflow) { |
- EXPECT_FALSE(FX_TryAlloc(int, kOverflowIntAlloc)); |
+ EXPECT_FALSE(FX_TryAlloc(int, kOverflowIntAlloc)); |
- int* ptr = FX_Alloc(int, 1); |
- EXPECT_TRUE(ptr); |
- EXPECT_FALSE(FX_TryRealloc(int, ptr, kOverflowIntAlloc)); |
- FX_Free(ptr); |
+ int* ptr = FX_Alloc(int, 1); |
+ EXPECT_TRUE(ptr); |
+ EXPECT_FALSE(FX_TryRealloc(int, ptr, kOverflowIntAlloc)); |
+ FX_Free(ptr); |
} |
TEST(fxcrt, DISABLED_FXMEM_DefaultOOM) { |
- EXPECT_FALSE(FXMEM_DefaultAlloc(kMaxByteAlloc, 0)); |
+ EXPECT_FALSE(FXMEM_DefaultAlloc(kMaxByteAlloc, 0)); |
- void* ptr = FXMEM_DefaultAlloc(1, 0); |
- EXPECT_TRUE(ptr); |
- EXPECT_FALSE(FXMEM_DefaultRealloc(ptr, kMaxByteAlloc, 0)); |
- FXMEM_DefaultFree(ptr, 0); |
+ void* ptr = FXMEM_DefaultAlloc(1, 0); |
+ EXPECT_TRUE(ptr); |
+ EXPECT_FALSE(FXMEM_DefaultRealloc(ptr, kMaxByteAlloc, 0)); |
+ FXMEM_DefaultFree(ptr, 0); |
} |