From: Ali Maredia <amaredia@redhat.com>
Date: Tue, 2 Feb 2016 01:42:17 +0000 (-0500)
Subject: cmake: moved tests into test/msgr dir
X-Git-Tag: v10.2.0~27^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7c14597ebad8da63865e532076d4c9b17596c94;p=ceph.git

cmake: moved tests into test/msgr dir

Added a CMakeLists.txt into test/msgr.

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

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 52cc1f16c574..8350779dda2a 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -19,6 +19,7 @@ add_subdirectory(journal)
 add_subdirectory(libcephfs)
 add_subdirectory(librados_test_stub)
 add_subdirectory(messenger)
+add_subdirectory(msgr)
 
 # test_timers
 add_executable(ceph_test_timers
@@ -395,22 +396,6 @@ target_link_libraries(test_librbd_fsx
   keyutils
   )
 
-# ceph_test_async_driver
-add_executable(ceph_test_async_driver
-  msgr/test_async_driver.cc
-  )
-set_target_properties(ceph_test_async_driver PROPERTIES COMPILE_FLAGS
-  ${UNITTEST_CXX_FLAGS})
-target_link_libraries(ceph_test_async_driver os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
-
-# ceph_test_msgr
-add_executable(ceph_test_msgr
-  msgr/test_msgr.cc
-  )
-set_target_properties(ceph_test_msgr PROPERTIES COMPILE_FLAGS
-  ${UNITTEST_CXX_FLAGS})
-target_link_libraries(ceph_test_msgr os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
-
 #ceph_perf_local
 add_executable(ceph_perf_local 
   perf_local.cc
@@ -421,18 +406,6 @@ set_target_properties(ceph_perf_local PROPERTIES COMPILE_FLAGS
   ${PERF_LOCAL_FLAGS})
 target_link_libraries(ceph_perf_local os global ${UNITTEST_LIBS})
 
-#ceph_perf_msgr_server
-add_executable(ceph_perf_msgr_server msgr/perf_msgr_server.cc)
-set_target_properties(ceph_perf_msgr_server PROPERTIES COMPILE_FLAGS
-  ${UNITTEST_CXX_FLAGS})
-target_link_libraries(ceph_perf_msgr_server os global ${UNITTEST_LIBS})
-
-#ceph_perf_msgr_client
-add_executable(ceph_perf_msgr_client msgr/perf_msgr_client.cc)
-set_target_properties(ceph_perf_msgr_client PROPERTIES COMPILE_FLAGS
-  ${UNITTEST_CXX_FLAGS})
-target_link_libraries(ceph_perf_msgr_client os global ${UNITTEST_LIBS})
-
 # ceph_test_xattr_bench
 add_executable(ceph_test_xattr_bench
   xattr_bench.cc
diff --git a/src/test/msgr/CMakeLists.txt b/src/test/msgr/CMakeLists.txt
new file mode 100644
index 000000000000..dd2e48d788b2
--- /dev/null
+++ b/src/test/msgr/CMakeLists.txt
@@ -0,0 +1,28 @@
+# ceph_test_async_driver
+add_executable(ceph_test_async_driver
+  test_async_driver.cc
+  )
+set_target_properties(ceph_test_async_driver PROPERTIES COMPILE_FLAGS
+  ${UNITTEST_CXX_FLAGS})
+target_link_libraries(ceph_test_async_driver os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
+
+# ceph_test_msgr
+add_executable(ceph_test_msgr
+  test_msgr.cc
+  )
+set_target_properties(ceph_test_msgr PROPERTIES COMPILE_FLAGS
+  ${UNITTEST_CXX_FLAGS})
+target_link_libraries(ceph_test_msgr os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
+
+#ceph_perf_msgr_server
+add_executable(ceph_perf_msgr_server perf_msgr_server.cc)
+set_target_properties(ceph_perf_msgr_server PROPERTIES COMPILE_FLAGS
+  ${UNITTEST_CXX_FLAGS})
+target_link_libraries(ceph_perf_msgr_server os global ${UNITTEST_LIBS})
+
+#ceph_perf_msgr_client
+add_executable(ceph_perf_msgr_client perf_msgr_client.cc)
+set_target_properties(ceph_perf_msgr_client PROPERTIES COMPILE_FLAGS
+  ${UNITTEST_CXX_FLAGS})
+target_link_libraries(ceph_perf_msgr_client os global ${UNITTEST_LIBS})
+