Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: core/src/fxcrt/fx_basic_memmgr_unittest.cpp

Issue 1142463005: Disable allocation tests that hose the bot. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Naming conflict. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 20fd93d3f888b5d20dd145fa32db7e0be7fe55f3..565021d29e08880eb283b4e689abe92eba844fb7 100644
--- a/core/src/fxcrt/fx_basic_memmgr_unittest.cpp
+++ b/core/src/fxcrt/fx_basic_memmgr_unittest.cpp
@@ -15,29 +15,45 @@ const size_t kOverflowIntAlloc = kMaxIntAlloc + 100;
} // namespace
-TEST(fxcrt, FX_AllocOOM) {
+// 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(FX_Alloc(int, kMaxIntAlloc), "");
- EXPECT_DEATH_IF_SUPPORTED(FX_Alloc(int, kOverflowIntAlloc), "");
int* ptr = FX_Alloc(int, 1);
EXPECT_TRUE(ptr);
EXPECT_DEATH_IF_SUPPORTED(FX_Realloc(int, ptr, kMaxIntAlloc), "");
+ FX_Free(ptr);
+}
+
+TEST(fxcrt, FX_AllocOverflow) {
+ EXPECT_DEATH_IF_SUPPORTED(FX_Alloc(int, kOverflowIntAlloc), "");
+
+ int* ptr = FX_Alloc(int, 1);
+ EXPECT_TRUE(ptr);
EXPECT_DEATH_IF_SUPPORTED(FX_Realloc(int, ptr, kOverflowIntAlloc), "");
FX_Free(ptr);
}
-TEST(fxcrt, FX_TryAllocOOM) {
+TEST(fxcrt, DISABLED_FX_TryAllocOOM) {
EXPECT_FALSE(FX_TryAlloc(int, kMaxIntAlloc));
- EXPECT_FALSE(FX_TryAlloc(int, kOverflowIntAlloc));
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));
+
+ int* ptr = FX_Alloc(int, 1);
+ EXPECT_TRUE(ptr);
EXPECT_FALSE(FX_TryRealloc(int, ptr, kOverflowIntAlloc));
FX_Free(ptr);
}
-TEST(fxcrt, FXMEM_DefaultOOM) {
+TEST(fxcrt, DISABLED_FXMEM_DefaultOOM) {
EXPECT_FALSE(FXMEM_DefaultAlloc(kMaxByteAlloc, 0));
void* ptr = FXMEM_DefaultAlloc(1, 0);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698