From: Yuval Lifshitz <yuvalif@yahoo.com>
Date: Thu, 28 Feb 2019 06:51:51 +0000 (+0200)
Subject: Merge branch 'add_rgw_xml_unit_tests' of https://github.com/yuvalif/ceph into add_rgw... 
X-Git-Tag: v14.1.1~68^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69eed533b2e9b477d0715041e05af41a6e2ea4ad;p=ceph.git

Merge branch 'add_rgw_xml_unit_tests' of https://github.com/yuvalif/ceph into add_rgw_xml_unit_tests
---

69eed533b2e9b477d0715041e05af41a6e2ea4ad
diff --cc src/test/rgw/CMakeLists.txt
index 530753023bfa,5dd8e5818d5c..81972e016ca4
--- a/src/test/rgw/CMakeLists.txt
+++ b/src/test/rgw/CMakeLists.txt
@@@ -146,8 -143,15 +146,15 @@@ if(WITH_BOOST_CONTEXT
    target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
  endif()
  
 -# unittest_rgw_amqp
 -add_executable(unittest_rgw_amqp test_rgw_amqp.cc)
 -add_ceph_unittest(unittest_rgw_amqp)
 -
 -target_link_libraries(unittest_rgw_amqp rgw_a amqp_mock)
 +if(WITH_RADOSGW_AMQP_ENDPOINT)
 +  add_executable(unittest_rgw_amqp test_rgw_amqp.cc)
 +  add_ceph_unittest(unittest_rgw_amqp)
 +  target_link_libraries(unittest_rgw_amqp ${rgw_libs})
 +endif()
+ 
+ # unittest_rgw_xml
+ add_executable(unittest_rgw_xml test_rgw_xml.cc)
+ add_ceph_unittest(unittest_rgw_xml)
+ 
+ target_link_libraries(unittest_rgw_xml rgw_a ${EXPAT_LIBRARIES})
+