Merge pull request ceph#11768 from linuxbox2/xio-build-2

xio: fix build
att · Nov 3, 2016 · 2e2ca3b · 2e2ca3b
2 parents bb87921 + c5aa43d
commit 2e2ca3b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/msg/xio/XioMessenger.cc b/src/msg/xio/XioMessenger.cc
@@ -378,13 +378,13 @@ XioMessenger::XioMessenger(CephContext *cct, entity_name_t name,
   /* update class instance count */
   nInstances.inc();
 
-  loop_con->set_features(features);
+  loop_con->set_features(CEPH_FEATURES_ALL);
 
   ldout(cct,2) << "Create msgr: " << this << " instance: "
     << nInstances.read() << " type: " << name.type_str()
     << " subtype: " << mname << " nportals: " << get_nportals(cflags)
-    << " nconns_per_portal: " << get_nconns_per_portal(cflags) << " features: "
-    << features << dendl;
+    << " nconns_per_portal: " << get_nconns_per_portal(cflags)
+    << dendl;
 
 } /* ctor */
 

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -584,14 +584,14 @@ add_executable(unittest_encoding
   encoding.cc
   )
 add_ceph_unittest(unittest_encoding ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_encoding)
-target_link_libraries(unittest_encoding common librados pthread rt m ${BLKID_LIBRARIES})
+target_link_libraries(unittest_encoding common librados ${XIO_LIBRARY} pthread rt m ${BLKID_LIBRARIES})
 
 # unittest_addrs
 add_executable(unittest_addrs
   test_addrs.cc
   )
 add_ceph_unittest(unittest_addrs ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_addrs)
-target_link_libraries(unittest_addrs common librados pthread rt m ${BLKID_LIBRARIES})
+target_link_libraries(unittest_addrs common librados ${XIO_LIBRARY} pthread rt m ${BLKID_LIBRARIES})
 
 # unittest_workqueue
 add_executable(unittest_workqueue
@@ -689,7 +689,7 @@ add_executable(unittest_xlist
   test_xlist.cc
   )
 add_ceph_unittest(unittest_xlist ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_xlist)
-target_link_libraries(unittest_xlist common)
+target_link_libraries(unittest_xlist common ${XIO_LIBRARY})
 
 # unittest_arch
 add_executable(unittest_arch

diff --git a/src/test/messenger/xio_client.cc b/src/test/messenger/xio_client.cc
@@ -117,7 +117,8 @@ int main(int argc, const char **argv)
 	messenger = new XioMessenger(g_ceph_context,
 				     entity_name_t::MON(-1),
 				     "xio_client",
-				     0 /* nonce */, XIO_ALL_FEATURES, 0 /* cflags */,
+				     0 /* nonce */,
+				     0 /* cflags */,
 				     dstrategy);
 
 	// enable timing prints

diff --git a/src/test/messenger/xio_server.cc b/src/test/messenger/xio_server.cc
@@ -88,7 +88,8 @@ int main(int argc, const char **argv)
 	messenger = new XioMessenger(g_ceph_context,
 				     entity_name_t::MON(-1),
 				     "xio_server",
-				     0 /* nonce */, XIO_ALL_FEATURES, 0 /* cflags */,
+				     0 /* nonce */,
+				     0 /* cflags */,
 				     dstrategy);
 
 	static_cast<XioMessenger*>(messenger)->set_magic(

diff --git a/src/test/objectstore/CMakeLists.txt b/src/test/objectstore/CMakeLists.txt
@@ -139,7 +139,7 @@ endif(HAVE_LIBAIO)
 add_executable(unittest_transaction
   test_transaction.cc)
 add_ceph_unittest(unittest_transaction ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_transaction)
-target_link_libraries(unittest_transaction os common)
+target_link_libraries(unittest_transaction os common ${XIO_LIBRARY})
 
 # unittest_memstore_clone
 add_executable(unittest_memstore_clone