From 02d508c7278ed29fb71cefb0f851e35f383d7f99 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Mon, 1 Feb 2016 19:59:37 -0500 Subject: [PATCH] cmake: moved tests into test/compressor dir Added a CMakeLists.txt into test/compressor, libcompressor to src/compressor/CMakeLists.txt, added absolute path into $snappy_sources, removed .libs from compressor unit test source files Signed-off-by: Ali Maredia --- src/CMakeLists.txt | 6 +- src/compressor/CMakeLists.txt | 7 ++ src/compressor/snappy/CMakeLists.txt | 3 +- src/test/CMakeLists.txt | 5 +- src/test/compressor/CMakeLists.txt | 76 +++++++++++++++++++ .../compressor/test_compression_plugin.cc | 14 +++- .../test_compression_plugin_snappy.cc | 10 ++- .../compressor/test_compression_snappy.cc | 3 +- src/test/compressor/test_compression_zlib.cc | 4 +- 9 files changed, 111 insertions(+), 17 deletions(-) create mode 100644 src/test/compressor/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8cda83992043..c66b1312f5bd1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -840,11 +840,7 @@ target_link_libraries(cephfstool common ${EXTRALIBS}) set_target_properties(cephfstool PROPERTIES OUTPUT_NAME cephfs) install(TARGETS cephfstool DESTINATION bin) -set(compressor_srcs - compressor/Compressor.cc - compressor/AsyncCompressor.cc) -add_library(compressor STATIC ${compressor_srcs}) -target_link_libraries(compressor common snappy) +add_subdirectory(compressor) add_executable(ceph-client-debug tools/ceph-client-debug.cc) target_link_libraries(ceph-client-debug cephfs librados global common) diff --git a/src/compressor/CMakeLists.txt b/src/compressor/CMakeLists.txt index fcdf8a345c2a0..0cef856e1514c 100644 --- a/src/compressor/CMakeLists.txt +++ b/src/compressor/CMakeLists.txt @@ -1,3 +1,10 @@ + +set(compressor_srcs + Compressor.cc + AsyncCompressor.cc) +add_library(compressor STATIC ${compressor_srcs}) +target_link_libraries(compressor common snappy ${CMAKE_DL_LIBS}) + ## compressor plugins set(compressorlibdir ${LIBRARY_OUTPUT_PATH}/compressor) diff --git a/src/compressor/snappy/CMakeLists.txt b/src/compressor/snappy/CMakeLists.txt index 62e8df8be4a55..43cb61eca333c 100644 --- a/src/compressor/snappy/CMakeLists.txt +++ b/src/compressor/snappy/CMakeLists.txt @@ -1,7 +1,8 @@ # snappy +# absolute path because $snappy_sources used outside of this directory set(snappy_sources - CompressionPluginSnappy.cc + ${CMAKE_SOURCE_DIR}/src/compressor/snappy/CompressionPluginSnappy.cc $ ) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index d15a48d39b08f..4c379cad8d3b2 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -13,6 +13,7 @@ add_subdirectory(cls_replica_log) add_subdirectory(cls_rgw) add_subdirectory(cls_statelog) add_subdirectory(cls_version) +add_subdirectory(compressor) # test_timers add_executable(ceph_test_timers @@ -680,7 +681,9 @@ add_dependencies(check ceph-monstore-tool osdmaptool rbd - radosgw-admin) + radosgw-admin + ceph_example + ceph_snappy) add_ceph_test(test-ceph-helpers.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-ceph-helpers.sh) add_ceph_test(erasure-decode-non-regression.sh ${CMAKE_SOURCE_DIR}/qa/workunits/erasure-code/encode-decode-non-regression.sh) diff --git a/src/test/compressor/CMakeLists.txt b/src/test/compressor/CMakeLists.txt new file mode 100644 index 0000000000000..0b35f543e50a4 --- /dev/null +++ b/src/test/compressor/CMakeLists.txt @@ -0,0 +1,76 @@ +add_library(ceph_example SHARED + compressor_plugin_example.cc + ${CMAKE_SOURCE_DIR}/src/compressor/Compressor.cc + ) +target_link_libraries(ceph_example crush pthread ${EXTRA_LIBS}) + +# unittest_compression_plugin +add_executable(unittest_compression_plugin EXCLUDE_FROM_ALL + test_compression_plugin.cc + ${CMAKE_SOURCE_DIR}/src/compressor/Compressor.cc + ) +add_ceph_unittest(unittest_compression_plugin ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_compression_plugin) +target_link_libraries(unittest_compression_plugin + osd + common + global + dl + ) + +# unittest_compression_snappy +add_executable(unittest_compression_snappy EXCLUDE_FROM_ALL + test_compression_snappy.cc + ${snappy_sources} + ) +add_ceph_unittest(unittest_compression_snappy ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_compression_snappy) +target_link_libraries(unittest_compression_snappy + osd + common + global + dl + snappy + ) + +# unittest_compression_plugin_snappy +add_executable(unittest_compression_plugin_snappy EXCLUDE_FROM_ALL + test_compression_plugin_snappy.cc + ${snappy_sources} + ) +add_ceph_unittest(unittest_compression_plugin_snappy ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_compression_plugin_snappy) +target_link_libraries(unittest_compression_plugin_snappy + osd + common + global + compressor + dl + snappy + ) + +# unittest_compression_zlib +add_executable(unittest_compression_zlib EXCLUDE_FROM_ALL + test_compression_zlib.cc + ${CMAKE_SOURCE_DIR}/src/compressor/zlib/CompressionZlib.cc + ) +add_ceph_unittest(unittest_compression_zlib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_compression_zlib) +target_link_libraries(unittest_compression_zlib + z + osd + common + global + ) + +# unittest_compression_plugin_zlib +add_executable(unittest_compression_plugin_zlib EXCLUDE_FROM_ALL + test_compression_plugin_zlib.cc + ${zlib_sources} + ) +add_ceph_unittest(unittest_compression_plugin_zlib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_compression_plugin_zlib) +target_link_libraries(unittest_compression_plugin_zlib + osd + common + global + compressor + dl + z + ) + diff --git a/src/test/compressor/test_compression_plugin.cc b/src/test/compressor/test_compression_plugin.cc index e898b80233388..32e4ba81513ad 100644 --- a/src/test/compressor/test_compression_plugin.cc +++ b/src/test/compressor/test_compression_plugin.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include "global/global_init.h" #include "compressor/CompressionPlugin.h" @@ -26,7 +27,7 @@ TEST(CompressionPlugin, all) { - string directory(".libs"); + string directory = getenv("CEPH_LIB"); CompressorRef compressor; PluginRegistry *reg = g_ceph_context->get_plugin_registry(); EXPECT_TRUE(reg); @@ -52,11 +53,16 @@ int main(int argc, char **argv) { global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); common_init_finish(g_ceph_context); - int r = system("mkdir -p .libs/compressor"); + string directory = getenv("CEPH_LIB"); + string mkdir_compressor = "mkdir -p " + directory + "/compressor"; + int r = system(mkdir_compressor.c_str()); (void)r; - r = system("cp .libs/libceph_example.so* .libs/compressor/"); + + string cp_libceph_example = "cp " + directory + "/libceph_example.so* " + directory + "/compressor/"; + r = system(cp_libceph_example.c_str()); (void)r; - g_conf->set_val("plugin_dir", ".libs", false, false); + + g_conf->set_val("plugin_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/test/compressor/test_compression_plugin_snappy.cc b/src/test/compressor/test_compression_plugin_snappy.cc index 2855f7adf44fd..21537e83a6b18 100644 --- a/src/test/compressor/test_compression_plugin_snappy.cc +++ b/src/test/compressor/test_compression_plugin_snappy.cc @@ -38,12 +38,16 @@ int main(int argc, char **argv) { global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); common_init_finish(g_ceph_context); - int r = system("mkdir -p .libs/compressor"); + string directory = getenv("CEPH_LIB"); + string mkdir_compressor = "mkdir -p " + directory + "/compressor"; + int r = system(mkdir_compressor.c_str()); (void)r; - r = system("cp .libs/libceph_snappy.so* .libs/compressor/"); + + string cp_libceph_snappy = "cp " + directory + "/libceph_snappy.so* " + directory + "/compressor/"; + r = system(cp_libceph_snappy.c_str()); (void)r; - g_conf->set_val("plugin_dir", ".libs", false, false); + g_conf->set_val("plugin_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/test/compressor/test_compression_snappy.cc b/src/test/compressor/test_compression_snappy.cc index 556390b59db30..37ddbf3b6a823 100644 --- a/src/test/compressor/test_compression_snappy.cc +++ b/src/test/compressor/test_compression_snappy.cc @@ -77,7 +77,8 @@ int main(int argc, char **argv) { global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); common_init_finish(g_ceph_context); - g_conf->set_val("compression_dir", ".libs", false, false); + string directory = getenv("CEPH_LIB"); + g_conf->set_val("plugin_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/test/compressor/test_compression_zlib.cc b/src/test/compressor/test_compression_zlib.cc index 70df87f7491b6..0b5248616e9f8 100644 --- a/src/test/compressor/test_compression_zlib.cc +++ b/src/test/compressor/test_compression_zlib.cc @@ -26,7 +26,7 @@ TEST(CompressionZlib, compress_decompress) { CompressionZlib sp; - EXPECT_EQ(sp.get_method_name(), "zlib"); + EXPECT_STREQ(sp.get_method_name(), "zlib"); const char* test = "This is test text"; int len = strlen(test); bufferlist in, out; @@ -44,7 +44,7 @@ TEST(CompressionZlib, compress_decompress) TEST(CompressionZlib, compress_decompress_chunk) { CompressionZlib sp; - EXPECT_EQ(sp.get_method_name(), "zlib"); + EXPECT_STREQ(sp.get_method_name(), "zlib"); const char* test = "This is test text"; buffer::ptr test2 ("1234567890", 10); int len = strlen(test); -- 2.39.5