From 99d66ca5c825f90bb75cda95db43202b55e3d266 Mon Sep 17 00:00:00 2001
From: Ali Maredia <amaredia@redhat.com>
Date: Mon, 1 Feb 2016 20:19:04 -0500
Subject: [PATCH] cmake: moved tests into test/journal dir

Added a CMakeLists.txt into test/journal.

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

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index b4270d795d0e8..23961485a222e 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -15,6 +15,7 @@ add_subdirectory(cls_statelog)
 add_subdirectory(cls_version)
 add_subdirectory(compressor)
 add_subdirectory(filestore)
+add_subdirectory(journal)
 
 # test_timers
 add_executable(ceph_test_timers
@@ -345,7 +346,7 @@ set(librados_test_stub_srcs
   librados_test_stub/TestMemIoCtxImpl.cc
   librados_test_stub/TestMemRadosClient.cc
   librados_test_stub/TestRadosClient.cc)
-add_library(librados_test_stub STATIC ${librados_test_stub_srcs})
+add_library(rados_test_stub STATIC ${librados_test_stub_srcs})
   
 # unittest_librbd
 add_executable(unittest_librbd EXCLUDE_FROM_ALL
@@ -370,7 +371,7 @@ target_link_libraries(unittest_librbd
   journal
   cls_journal_client
   librados_api
-  librados_test_stub
+  rados_test_stub
   ${UNITTEST_LIBS}
   global
   ${CMAKE_DL_LIBS}
diff --git a/src/test/journal/CMakeLists.txt b/src/test/journal/CMakeLists.txt
new file mode 100644
index 0000000000000..07dbbc5de5488
--- /dev/null
+++ b/src/test/journal/CMakeLists.txt
@@ -0,0 +1,27 @@
+# unittest_journal
+set(unittest_journal_srcs
+  test_main.cc
+  test_Entry.cc
+  test_FutureImpl.cc
+  test_Journaler.cc
+  test_JournalMetadata.cc
+  test_JournalPlayer.cc
+  test_JournalRecorder.cc
+  test_JournalTrimmer.cc
+  test_ObjectPlayer.cc
+  test_ObjectRecorder.cc
+  RadosTestFixture.cc
+  )
+
+add_executable(unittest_journal EXCLUDE_FROM_ALL
+  ${unittest_journal_srcs} 
+  )
+add_ceph_unittest(unittest_journal ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_journal)
+target_link_libraries(unittest_journal 
+  rados_test_stub
+  librados
+  radostest
+  journal
+  cls_journal_client
+  global 
+  )
-- 
2.39.5