From: Ali Maredia Date: Thu, 28 Jan 2016 21:45:55 +0000 (-0500) Subject: cmake: moved tests into test/libradosstriper dir X-Git-Tag: v10.2.0~27^2~48 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3fffaa6e3e89b7a6facbdf89146ac9e27afdebe7;p=ceph.git cmake: moved tests into test/libradosstriper dir Added a CMakeLists.txt into test/libradosstriper. Signed-off-by: Ali Maredia --- diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index a425bd8ab15b..3874c0bcb56d 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -847,19 +847,6 @@ add_executable(ceph_test_snap_mapper EXCLUDE_FROM_ALL ) target_link_libraries(ceph_test_snap_mapper osd global ${BLKID_LIBRARIES}) -add_library(rados_striper_test STATIC libradosstriper/TestCase.cc) -target_link_libraries(rados_striper_test radostest) -set_target_properties(rados_striper_test PROPERTIES COMPILE_FLAGS - ${UNITTEST_CXX_FLAGS}) - -add_executable(ceph_test_rados_api_striping - libradosstriper/striping.cc - ) -target_link_libraries(ceph_test_rados_api_striping librados libradosstriper - ${UNITTEST_LIBS} rados_striper_test) -set_target_properties(ceph_test_rados_api_striping PROPERTIES COMPILE_FLAGS - ${UNITTEST_CXX_FLAGS}) - if(${WITH_CEPHFS}) add_executable(ceph_test_libcephfs libcephfs/test.cc @@ -1043,10 +1030,7 @@ add_ceph_test(test-erasure-code.sh ${CMAKE_SOURCE_DIR}/src/test/erasure-code/tes add_ceph_test(test-erasure-eio.sh ${CMAKE_SOURCE_DIR}/src/test/erasure-code/test-erasure-eio.sh) add_subdirectory(fs) - -#libradosstriper directory -add_ceph_test(rados-striper.sh ${CMAKE_SOURCE_DIR}/src/test/libradosstriper/rados-striper.sh) - +add_subdirectory(libradosstriper) add_subdirectory(librados) #mds directory diff --git a/src/test/libradosstriper/CMakeLists.txt b/src/test/libradosstriper/CMakeLists.txt new file mode 100644 index 000000000000..0c16689472b7 --- /dev/null +++ b/src/test/libradosstriper/CMakeLists.txt @@ -0,0 +1,14 @@ +add_library(rados_striper_test STATIC TestCase.cc) +target_link_libraries(rados_striper_test radostest) +set_target_properties(rados_striper_test PROPERTIES COMPILE_FLAGS + ${UNITTEST_CXX_FLAGS}) + +add_executable(ceph_test_rados_api_striping + striping.cc + ) +target_link_libraries(ceph_test_rados_api_striping librados libradosstriper + ${UNITTEST_LIBS} rados_striper_test) +set_target_properties(ceph_test_rados_api_striping PROPERTIES COMPILE_FLAGS + ${UNITTEST_CXX_FLAGS}) + +add_ceph_test(rados-striper.sh ${CMAKE_SOURCE_DIR}/src/test/libradosstriper/rados-striper.sh)