From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 26 Nov 2013 19:39:28 +0000 (-0800)
Subject: test: remove zero-copy read_fd test temporarily
X-Git-Tag: v0.74~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5357c0c444469a1abf1672a07156e447afe7a69;p=ceph.git

test: remove zero-copy read_fd test temporarily

This fails since zero-copy from read_fd was temporarily disabled by
03d63c4b2d63b655924c5657637e85abdef40899.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc
index 8962575f6ec0..85af76486f54 100644
--- a/src/test/bufferlist.cc
+++ b/src/test/bufferlist.cc
@@ -1775,13 +1775,8 @@ TEST(BufferList, read_fd) {
   bufferlist bl;
   EXPECT_EQ(-EBADF, bl.read_fd(fd, len));
   fd = ::open("testfile", O_RDONLY);
-#ifdef CEPH_HAVE_SPLICE
-  EXPECT_EQ(0, bl.read_fd(fd, len));
-  EXPECT_EQ(0u, bl.buffers().front().unused_tail_length());
-#else
   EXPECT_EQ(len, (unsigned)bl.read_fd(fd, len));
   EXPECT_EQ(CEPH_PAGE_SIZE - len, bl.buffers().front().unused_tail_length());
-#endif
   EXPECT_EQ(len, bl.length());
   ::close(fd);
   ::unlink("testfile");