From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Aug 2015 22:22:51 +0000 (-0400)
Subject: test/encoding: c++11 STL appears to make fewer copies, yay
X-Git-Tag: v9.1.0~408^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82533aa4c4c343aac8230807ede28a968a6cd9c5;p=ceph.git

test/encoding: c++11 STL appears to make fewer copies, yay

The failure was

test/encoding.cc:191: Failure
Value of: 10
Expected: my_key_t::get_copy_ctor()
Which is: 5
test/encoding.cc:196: Failure
Value of: 10
Expected: my_val_t::get_copy_ctor()
Which is: 5

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

diff --git a/src/test/encoding.cc b/src/test/encoding.cc
index a047b61a3015..4f2b26c52279 100644
--- a/src/test/encoding.cc
+++ b/src/test/encoding.cc
@@ -188,12 +188,12 @@ TEST(EncodingRoundTrip, MultimapConstructorCounter) {
 
   EXPECT_EQ(my_key_t::get_default_ctor(), 5);
   EXPECT_EQ(my_key_t::get_one_arg_ctor(), 0);
-  EXPECT_EQ(my_key_t::get_copy_ctor(), 10);
+  EXPECT_EQ(my_key_t::get_copy_ctor(), 5);
   EXPECT_EQ(my_key_t::get_assigns(), 0);
 
   EXPECT_EQ(my_val_t::get_default_ctor(), 5);
   EXPECT_EQ(my_val_t::get_one_arg_ctor(), 0);
-  EXPECT_EQ(my_val_t::get_copy_ctor(), 10);
+  EXPECT_EQ(my_val_t::get_copy_ctor(), 5);
   EXPECT_EQ(my_val_t::get_assigns(), 0);
 }