cmake: moved tests into test/rgw dir

Added a CMakeLists.txt into test/rgw.

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 2149452b4dd38795017fd756830b898e77482b73..a9cfe2cf90c0e3d9961bb1f74919e976270350c9 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -22,6 +22,7 @@ add_subdirectory(messenger)
 add_subdirectory(msgr)
 add_subdirectory(ObjectMap)
 add_subdirectory(osdc)
+add_subdirectory(rgw)
 
 # test_timers
 add_executable(ceph_test_timers
@@ -198,63 +199,6 @@ if(${WITH_RADOSGW})
   set_target_properties(test_cors PROPERTIES COMPILE_FLAGS
     ${UNITTEST_CXX_FLAGS})
 
-  # test_rgw_manifest
-  set(test_rgw_manifest_srcs rgw/test_rgw_manifest.cc)
-  add_executable(test_rgw_manifest
-    ${test_rgw_manifest_srcs}
-    )
-  target_link_libraries(test_rgw_manifest
-    rgw_a
-    cls_rgw_client
-    cls_lock_client
-    cls_refcount_client
-    cls_log_client
-    cls_statelog_client
-    cls_timeindex_client
-    cls_version_client
-    cls_replica_log_client
-    cls_kvs
-    cls_user_client
-    librados
-    global
-    curl
-    expat
-    ${BLKID_LIBRARIES}
-    ${CMAKE_DL_LIBS}
-    ${UNITTEST_LIBS}
-    ${CRYPTO_LIBS}
-    )
-  set_target_properties(test_rgw_manifest PROPERTIES COMPILE_FLAGS
-    ${UNITTEST_CXX_FLAGS})
-
-  # test_rgw_obj
-  set(test_rgw_obj_srcs rgw/test_rgw_obj.cc)
-  add_executable(test_rgw_obj
-    ${test_rgw_obj_srcs}
-    )
-  target_link_libraries(test_rgw_obj
-    rgw_a
-    cls_rgw_client
-    cls_lock_client
-    cls_refcount_client
-    cls_log_client
-    cls_statelog_client
-    cls_version_client
-    cls_replica_log_client
-    cls_kvs
-    cls_user_client
-    librados
-    global
-    curl
-    uuid
-    expat
-    ${CMAKE_DL_LIBS}
-    ${UNITTEST_LIBS}
-    ${CRYPTO_LIBS}
-    )
-  set_target_properties(test_rgw_obj PROPERTIES COMPILE_FLAGS
-    ${UNITTEST_CXX_FLAGS})
-
   # test_cls_rgw_meta
   set(test_cls_rgw_meta_srcs test_rgw_admin_meta.cc)
   add_executable(test_cls_rgw_meta

diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
index a45c29ceebbfef7b2be3b6f43dd515a6d237076b..d47db6279c25554bee567f6d6c564a0cf1009bd2 100644 (file)
--- a/src/test/rgw/CMakeLists.txt
+++ b/src/test/rgw/CMakeLists.txt
@@ -1,5 +1,62 @@
-add_executable(test_rgw_period_history EXCLUDE_FROM_ALL test_rgw_period_history.cc)
-target_link_libraries(test_rgw_period_history rgw_a ${UNITTEST_LIBS})
-set_target_properties(test_rgw_period_history PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
-add_test(RGWPeriodHistory test_rgw_period_history)
-add_dependencies(check test_rgw_period_history)
+#unitttest_rgw_period_history
+add_executable(unittest_rgw_period_history EXCLUDE_FROM_ALL test_rgw_period_history.cc)
+add_ceph_unittest(unittest_rgw_period_history ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_rgw_period_history)
+target_link_libraries(unittest_rgw_period_history rgw_a)
+
+# ceph_test_rgw_manifest
+set(test_rgw_manifest_srcs test_rgw_manifest.cc)
+add_executable(ceph_test_rgw_manifest
+  ${test_rgw_manifest_srcs}
+  )
+target_link_libraries(ceph_test_rgw_manifest
+  rgw_a
+  cls_rgw_client
+  cls_lock_client
+  cls_refcount_client
+  cls_log_client
+  cls_statelog_client
+  cls_timeindex_client
+  cls_version_client
+  cls_replica_log_client
+  cls_kvs
+  cls_user_client
+  librados
+  global
+  curl
+  expat
+  ${BLKID_LIBRARIES}
+  ${CMAKE_DL_LIBS}
+  ${UNITTEST_LIBS}
+  ${CRYPTO_LIBS}
+  )
+set_target_properties(ceph_test_rgw_manifest PROPERTIES COMPILE_FLAGS
+  ${UNITTEST_CXX_FLAGS})
+
+# ceph_test_rgw_obj
+set(test_rgw_obj_srcs test_rgw_obj.cc)
+add_executable(ceph_test_rgw_obj
+  ${test_rgw_obj_srcs}
+  )
+target_link_libraries(ceph_test_rgw_obj
+  rgw_a
+  cls_rgw_client
+  cls_lock_client
+  cls_refcount_client
+  cls_log_client
+  cls_statelog_client
+  cls_version_client
+  cls_replica_log_client
+  cls_kvs
+  cls_user_client
+  librados
+  global
+  curl
+  uuid
+  expat
+  ${CMAKE_DL_LIBS}
+  ${UNITTEST_LIBS}
+  ${CRYPTO_LIBS}
+  )
+set_target_properties(ceph_test_rgw_obj PROPERTIES COMPILE_FLAGS
+  ${UNITTEST_CXX_FLAGS})
+