From eb8e49c5cb28b78bc3edc6ba7f88783e0f96542c Mon Sep 17 00:00:00 2001
From: Ali Maredia <amaredia@redhat.com>
Date: Mon, 1 Feb 2016 20:36:07 -0500
Subject: [PATCH] cmake: moved tests into test/libcephfs dir

Added a CMakeLists.txt into test/libcephfs.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---
 src/test/CMakeLists.txt           | 22 +---------------------
 src/test/libcephfs/CMakeLists.txt | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 src/test/libcephfs/CMakeLists.txt

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 23961485a222..46077f44f73f 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -16,6 +16,7 @@ add_subdirectory(cls_version)
 add_subdirectory(compressor)
 add_subdirectory(filestore)
 add_subdirectory(journal)
+add_subdirectory(libcephfs)
 
 # test_timers
 add_executable(ceph_test_timers
@@ -531,27 +532,6 @@ add_executable(ceph_test_snap_mapper EXCLUDE_FROM_ALL
   )
 target_link_libraries(ceph_test_snap_mapper osd global ${BLKID_LIBRARIES})
 
-if(${WITH_CEPHFS})
-  add_executable(ceph_test_libcephfs
-    libcephfs/test.cc
-    libcephfs/readdir_r_cb.cc
-    libcephfs/caps.cc
-    libcephfs/multiclient.cc
-    libcephfs/flock.cc
-    libcephfs/acl.cc
-    libcephfs/access.cc
-  )
-  set_target_properties(ceph_test_libcephfs PROPERTIES COMPILE_FLAGS
-    ${UNITTEST_CXX_FLAGS})
-  target_link_libraries(ceph_test_libcephfs
-    cephfs
-    librados
-    ${UNITTEST_LIBS}
-    ${EXTRALIBS}
-    ${CMAKE_DL_LIBS}
-    )
-endif(${WITH_CEPHFS})  
-
 add_executable(ceph_test_stress_watch
   test_stress_watch.cc
   )
diff --git a/src/test/libcephfs/CMakeLists.txt b/src/test/libcephfs/CMakeLists.txt
new file mode 100644
index 000000000000..3f44d85d1f2f
--- /dev/null
+++ b/src/test/libcephfs/CMakeLists.txt
@@ -0,0 +1,21 @@
+if(${WITH_CEPHFS})
+  add_executable(ceph_test_libcephfs
+    test.cc
+    readdir_r_cb.cc
+    caps.cc
+    multiclient.cc
+    flock.cc
+    acl.cc
+    access.cc
+  )
+  set_target_properties(ceph_test_libcephfs PROPERTIES COMPILE_FLAGS
+    ${UNITTEST_CXX_FLAGS})
+  target_link_libraries(ceph_test_libcephfs
+    cephfs
+    librados
+    ${UNITTEST_LIBS}
+    ${EXTRALIBS}
+    ${CMAKE_DL_LIBS}
+    )
+endif(${WITH_CEPHFS})  
+
-- 
2.47.3