From 2aa5950caf184a15b008550fec015528eae68dfd Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Sun, 14 Jan 2018 08:39:40 +1000 Subject: [PATCH] c_read_operations.cc: Silence tautological-compare compiler warning Signed-off-by: Brad Hubbard --- src/test/librados/c_read_operations.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/test/librados/c_read_operations.cc b/src/test/librados/c_read_operations.cc index f5713302d82..4ca5e21f99f 100644 --- a/src/test/librados/c_read_operations.cc +++ b/src/test/librados/c_read_operations.cc @@ -1,14 +1,18 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // Tests for the C API coverage of atomic read operations +#include // For memcpy #include #include +#include "include/buffer.h" +#include "include/denc.h" #include "include/err.h" #include "include/rados/librados.h" -#include "test/librados/test.h" -#include "test/librados/TestCase.h" +#include "include/rbd/features.h" // For RBD_FEATURES_ALL #include "include/scope_guard.h" +#include "test/librados/TestCase.h" +#include "test/librados/test.h" const char *data = "testdata"; const char *obj = "testobj"; @@ -470,7 +474,11 @@ TEST_F(CReadOpsTest, Exec) { uint64_t features; EXPECT_EQ(sizeof(features), bytes_read); // make sure buffer is at least as long as it claims - ASSERT_TRUE(out[bytes_read-1] == out[bytes_read-1]); + bufferlist bl; + bl.append(out, bytes_read); + auto it = bl.begin(); + ceph::decode(features, it); + ASSERT_EQ(RBD_FEATURES_ALL, features); rados_buffer_free(out); remove_object();