cmake: erasure-decode-non-regression.sh passing

Added missing dependencies and link libraries for
erasure-decode-non-regression.sh and added absolute
paths to ceph_erasure_code_non_regression.cc.

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/src/erasure-code/jerasure/CMakeLists.txt b/src/erasure-code/jerasure/CMakeLists.txt
index 99a47da82734302a7b4cd297ce50fddaa8da36fa..92380b80be04b30d999619e71d11450ceeeff82d 100644 (file)
--- a/src/erasure-code/jerasure/CMakeLists.txt
+++ b/src/erasure-code/jerasure/CMakeLists.txt
@@ -31,7 +31,7 @@ add_library(ec_jerasure_generic SHARED
   $<TARGET_OBJECTS:erasure_code_objs>
   )
 add_dependencies(ec_jerasure_generic ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
-target_link_libraries(ec_jerasure_generic ${EXTRALIBS})
+target_link_libraries(ec_jerasure_generic crush ${EXTRALIBS})
 set_target_properties(ec_jerasure_generic PROPERTIES VERSION 2.0.0 SOVERSION 2)
 install(TARGETS ec_jerasure_generic DESTINATION lib/erasure-code)
 
@@ -68,7 +68,7 @@ if(INTEL_SSE)
     $<TARGET_OBJECTS:erasure_code_objs>
     )
   add_dependencies(ec_jerasure_sse3 ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
-  target_link_libraries(ec_jerasure_sse3 ${EXTRALIBS})
+  target_link_libraries(ec_jerasure_sse3 crush ${EXTRALIBS})
   set_target_properties(ec_jerasure_sse3 PROPERTIES VERSION 2.0.0 SOVERSION 2
     COMPILE_FLAGS ${SSE3_FLAGS})
   install(TARGETS ec_jerasure_sse3 DESTINATION lib/erasure-code)
@@ -82,7 +82,7 @@ if(INTEL_SSE4_1)
     $<TARGET_OBJECTS:erasure_code_objs>
     )
   add_dependencies(ec_jerasure_sse4 ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
-  target_link_libraries(ec_jerasure_sse4 ${EXTRALIBS})
+  target_link_libraries(ec_jerasure_sse4 crush ${EXTRALIBS})
   set_target_properties(ec_jerasure_sse4 PROPERTIES VERSION 2.0.0 SOVERSION 2
     COMPILE_FLAGS ${SSE4_FLAGS})
   install(TARGETS ec_jerasure_sse4 DESTINATION lib/erasure-code)

diff --git a/src/erasure-code/lrc/CMakeLists.txt b/src/erasure-code/lrc/CMakeLists.txt
index acb4b54705242a92ac9eb934e660cc41a03eb537..cd9e923337eecbfede553c0977648b5aec7b9d2f 100644 (file)
--- a/src/erasure-code/lrc/CMakeLists.txt
+++ b/src/erasure-code/lrc/CMakeLists.txt
@@ -4,10 +4,11 @@ set(lrc_srcs
   ErasureCodePluginLrc.cc
   ErasureCodeLrc.cc
   $<TARGET_OBJECTS:erasure_code_objs>
+  ${CMAKE_SOURCE_DIR}/src/common/str_map.cc
 )
 
 add_library(ec_lrc SHARED ${lrc_srcs})
 add_dependencies(ec_lrc ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
-target_link_libraries(ec_lrc json_spirit)
+target_link_libraries(ec_lrc crush json_spirit)
 set_target_properties(ec_lrc PROPERTIES VERSION 1.0.0 SOVERSION 1)
 install(TARGETS ec_lrc DESTINATION lib/erasure-code)

diff --git a/src/erasure-code/shec/CMakeLists.txt b/src/erasure-code/shec/CMakeLists.txt
index f504e8b230a7f1693f77a47806a8c7fd50c5fd98..49d2954917d652a24e93858c2ac44993eddc10a0 100644 (file)
--- a/src/erasure-code/shec/CMakeLists.txt
+++ b/src/erasure-code/shec/CMakeLists.txt
@@ -42,7 +42,7 @@ if(INTEL_SSE)
     $<TARGET_OBJECTS:jerasure_objs>
     $<TARGET_OBJECTS:shec_objs>)
   add_dependencies(ec_shec_sse3 ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
-  target_link_libraries(ec_shec_sse3 ${EXTRALIBS})
+  target_link_libraries(ec_shec_sse3 crush ${EXTRALIBS})
   set_target_properties(ec_shec_sse3 PROPERTIES VERSION 2.0.0 SOVERSION 2
     COMPILE_FLAGS ${SSE3_FLAGS})
   install(TARGETS ec_shec_sse3 DESTINATION lib/erasure-code)
@@ -54,7 +54,7 @@ if(INTEL_SSE4_1)
     $<TARGET_OBJECTS:jerasure_objs>
     $<TARGET_OBJECTS:shec_objs>)
   add_dependencies(ec_shec_sse4 ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
-  target_link_libraries(ec_shec_sse4 ${EXTRALIBS})
+  target_link_libraries(ec_shec_sse4 crush ${EXTRALIBS})
   set_target_properties(ec_shec_sse4 PROPERTIES VERSION 2.0.0 SOVERSION 2
     COMPILE_FLAGS ${SSE4_FLAGS})
   install(TARGETS ec_shec_sse4 DESTINATION lib/erasure-code)

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 9455bc5f3bf8d24614fcdddcab693f7d471295e1..07f836ab618e73fc6af595b787a0396c2497b97c 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -377,7 +377,9 @@ add_dependencies(check
   ceph_example
   ceph_snappy
   cls_lock
-  ceph_test_objectstore)
+  ceph_test_objectstore
+  ceph_erasure_code_non_regression
+  ceph_erasure_code)
 
 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/erasure-code/ceph_erasure_code_non_regression.cc b/src/test/erasure-code/ceph_erasure_code_non_regression.cc
index 9241336061abbdd199aa2c3f567fe728c34b847b..eeeeb9f60b0964e27770425f4580a231ff950b5e 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code_non_regression.cc
+++ b/src/test/erasure-code/ceph_erasure_code_non_regression.cc
@@ -15,6 +15,7 @@
  */
 
 #include <errno.h>
+#include <stdlib.h>
 #include <boost/scoped_ptr.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/program_options/option.hpp>
@@ -99,8 +100,8 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) {
     CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);
   g_ceph_context->_conf->apply_changes(NULL);
-  string directory = getenv("CEPH_LIB");
-  g_conf->set_val("erasure_code_dir", directory, false, false);
+  string libs_dir = getenv("CEPH_LIB");
+  g_conf->set_val("erasure_code_dir", libs_dir, false, false);
 
   if (vm.count("help")) {
     cout << desc << std::endl;