From: Sage Weil <sage@inktank.com>
Date: Mon, 18 Feb 2013 05:47:30 +0000 (-0800)
Subject: buffer: drop large malloc tests
X-Git-Tag: v0.58~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=133d0ea2ce0c430e66f3c6f6eba36d2182ad8035;p=ceph.git

buffer: drop large malloc tests

These succeed on my machine and eat unseemly amounts of RAM.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc
index fe91fdf5937f..50508d0085ec 100644
--- a/src/test/bufferlist.cc
+++ b/src/test/bufferlist.cc
@@ -89,7 +89,8 @@ TEST(Buffer, constructors) {
     if (ceph_buffer_track)
       EXPECT_EQ(len, (unsigned)buffer::get_total_alloc());
     EXPECT_EQ(len, ptr.length());
-    EXPECT_THROW(buffer::create_malloc((unsigned)ULLONG_MAX), buffer::bad_alloc);
+    // this doesn't throw on my x86_64 wheezy box --sage
+    //EXPECT_THROW(buffer::create_malloc((unsigned)ULLONG_MAX), buffer::bad_alloc);
   }
   //
   // buffer::claim_malloc
@@ -130,7 +131,8 @@ TEST(Buffer, constructors) {
     ::memset(ptr.c_str(), 'X', len);
     if (ceph_buffer_track)
       EXPECT_EQ(len, (unsigned)buffer::get_total_alloc());
-    EXPECT_THROW(buffer::create_page_aligned((unsigned)ULLONG_MAX), buffer::bad_alloc);
+    // doesn't throw on my x86_64 wheezy box --sage
+    //EXPECT_THROW(buffer::create_page_aligned((unsigned)ULLONG_MAX), buffer::bad_alloc);
 #ifndef DARWIN
     ASSERT_TRUE(ptr.is_page_aligned());
 #endif // DARWIN