cmake: moved tests into test/system dir

Added a CMakeLists.txt into test/system.

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

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index a9cfe2cf90c0e3d9961bb1f74919e976270350c9..c8d2e1af24c7233b58205bc22c82c7dd90aa4228 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -23,6 +23,7 @@ add_subdirectory(msgr)
 add_subdirectory(ObjectMap)
 add_subdirectory(osdc)
 add_subdirectory(rgw)
+add_subdirectory(system)
 
 # test_timers
 add_executable(ceph_test_timers
@@ -125,63 +126,6 @@ target_link_libraries(ceph_kvstorebench librados global ${BLKID_LIBRARIES} ${CMA
 add_executable(ceph_objectstore_bench objectstore_bench.cc)
 target_link_libraries(ceph_objectstore_bench global ${BLKID_LIBRARIES} os)
 
-## System tests
-
-# systest
-set(libsystest_srcs system/cross_process_sem.cc
-  system/systest_runnable.cc
-  system/systest_settings.cc
-  system/st_rados_create_pool.cc
-  system/st_rados_delete_pool.cc
-  system/st_rados_list_objects.cc
-  system/st_rados_watch.cc
-  system/st_rados_notify.cc)
-add_library(systest STATIC ${libsystest_srcs})
-
-# test_rados_list_parallel
-add_executable(test_rados_list_parallel
-  system/rados_list_parallel.cc
-  )
-target_link_libraries(test_rados_list_parallel librados systest global pthread
-  rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
-# test_rados_open_pools_parallel
-set(test_rados_open_pools_parallel_srcs system/rados_open_pools_parallel.cc)
-add_executable(test_rados_open_pools_parallel
-  ${test_rados_open_pools_parallel_srcs}
-  )
-target_link_libraries(test_rados_open_pools_parallel librados systest global
-  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
-# test_rados_delete_pools_parallel
-set(test_rados_delete_pools_parallel_srcs
-  system/rados_delete_pools_parallel.cc
-  system/st_rados_create_pool.cc
-  system/st_rados_delete_pool.cc
-  system/st_rados_list_objects.cc
-
-  )
-add_executable(test_rados_delete_pools_parallel
-  ${test_rados_delete_pools_parallel_srcs}
-  )
-target_link_libraries(test_rados_delete_pools_parallel librados systest global
-  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
-# test_rados_watch_notify
-set(test_rados_watch_notify_srcs
-  system/rados_watch_notify.cc
-  system/st_rados_create_pool.cc
-  system/st_rados_delete_pool.cc
-  system/st_rados_delete_objs.cc
-  system/st_rados_watch.cc
-  system/st_rados_notify.cc
-  )
-add_executable(test_rados_watch_notify
-  ${test_rados_watch_notify_srcs}
-  )
-target_link_libraries(test_rados_watch_notify librados systest global
-  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
 if(${WITH_RADOSGW})
   # test_cors
   set(test_cors_srcs test_cors.cc)

diff --git a/src/test/system/CMakeLists.txt b/src/test/system/CMakeLists.txt
new file mode 100644 (file)
index 0000000..bd3a45b
--- /dev/null
+++ b/src/test/system/CMakeLists.txt
@@ -0,0 +1,57 @@
+## System tests
+
+set(libsystest_srcs 
+  cross_process_sem.cc
+  systest_runnable.cc
+  systest_settings.cc
+  st_rados_create_pool.cc
+  st_rados_delete_pool.cc
+  st_rados_list_objects.cc
+  st_rados_watch.cc
+  st_rados_notify.cc)
+add_library(systest STATIC ${libsystest_srcs})
+
+# test_rados_list_parallel
+add_executable(test_rados_list_parallel
+  rados_list_parallel.cc
+  )
+target_link_libraries(test_rados_list_parallel librados systest global pthread
+  rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+
+# test_rados_open_pools_parallel
+set(test_rados_open_pools_parallel_srcs 
+  rados_open_pools_parallel.cc)
+add_executable(test_rados_open_pools_parallel
+  ${test_rados_open_pools_parallel_srcs}
+  )
+target_link_libraries(test_rados_open_pools_parallel librados systest global
+  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+
+# test_rados_delete_pools_parallel
+set(test_rados_delete_pools_parallel_srcs
+  rados_delete_pools_parallel.cc
+  st_rados_create_pool.cc
+  st_rados_delete_pool.cc
+  st_rados_list_objects.cc
+  )
+add_executable(test_rados_delete_pools_parallel
+  ${test_rados_delete_pools_parallel_srcs}
+  )
+target_link_libraries(test_rados_delete_pools_parallel librados systest global
+  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+
+# test_rados_watch_notify
+set(test_rados_watch_notify_srcs
+  rados_watch_notify.cc
+  st_rados_create_pool.cc
+  st_rados_delete_pool.cc
+  st_rados_delete_objs.cc
+  st_rados_watch.cc
+  st_rados_notify.cc
+  )
+add_executable(test_rados_watch_notify
+  ${test_rados_watch_notify_srcs}
+  )
+target_link_libraries(test_rados_watch_notify librados systest global
+  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+