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 <amaredia@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8cda8399204347dbe0d91a0c81f4c3793781d99..c66b1312f5bd1ce0b9fdbca52a8b4ffc6a28e24c 100644 (file)
--- 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 fcdf8a345c2a076d5fe6436dffb8d83bd1a52b7e..0cef856e1514c635bb1a60787a1715c3c10adae4 100644 (file)
--- 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 62e8df8be4a551c5c48f5fba24c3bc1b205da519..43cb61eca333cb8fca7325e7f7d0afeb980447e6 100644 (file)
--- 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
   $<TARGET_OBJECTS:compressor_objs>
 )
 

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index d15a48d39b08fc97874baa8d7d628ed36ed0eed6..4c379cad8d3b2e485392d218806012c3b759f679 100644 (file)
--- 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 (file)
index 0000000..0b35f54
--- /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 e898b80233388e6774f325a741e2d29238acdc47..32e4ba81513addec9ae48763d2c1d1731b21ee75 100644 (file)
--- a/src/test/compressor/test_compression_plugin.cc
+++ b/src/test/compressor/test_compression_plugin.cc
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 #include <gtest/gtest.h>
 #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 2855f7adf44fdbeb3d3530826bd9a570f25ce0e2..21537e83a6b18eed6d80533f65c6ba63d055b1f3 100644 (file)
--- 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 556390b59db301fea29c9fb06acfe124ba4ad5d8..37ddbf3b6a82329f1718db3ec76fc1638e71f878 100644 (file)
--- 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 70df87f7491b67c9d548291784f533b19d7683bf..0b5248616e9f8bf305e61259292680da27b50c55 100644 (file)
--- 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);